正在显示
2 个修改的文件
包含
29 行增加
和
25 行删除
@@ -4,11 +4,7 @@ | @@ -4,11 +4,7 @@ | ||
4 | <bookmark url="file://$PROJECT_DIR$/application/admin/view/video/add.html" line="31" /> | 4 | <bookmark url="file://$PROJECT_DIR$/application/admin/view/video/add.html" line="31" /> |
5 | </component> | 5 | </component> |
6 | <component name="ChangeListManager"> | 6 | <component name="ChangeListManager"> |
7 | - <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> | ||
8 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
9 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" /> | ||
10 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" /> | ||
11 | - </list> | 7 | + <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="" /> |
12 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 8 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
13 | <option name="TRACKING_ENABLED" value="true" /> | 9 | <option name="TRACKING_ENABLED" value="true" /> |
14 | <option name="SHOW_DIALOG" value="false" /> | 10 | <option name="SHOW_DIALOG" value="false" /> |
@@ -248,8 +244,8 @@ | @@ -248,8 +244,8 @@ | ||
248 | </component> | 244 | </component> |
249 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 245 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
250 | <component name="ProjectFrameBounds" extendedState="1"> | 246 | <component name="ProjectFrameBounds" extendedState="1"> |
251 | - <option name="x" value="-64" /> | ||
252 | - <option name="y" value="95" /> | 247 | + <option name="x" value="199" /> |
248 | + <option name="y" value="83" /> | ||
253 | <option name="width" value="1652" /> | 249 | <option name="width" value="1652" /> |
254 | <option name="height" value="916" /> | 250 | <option name="height" value="916" /> |
255 | </component> | 251 | </component> |
@@ -268,6 +264,8 @@ | @@ -268,6 +264,8 @@ | ||
268 | <foldersAlwaysOnTop value="true" /> | 264 | <foldersAlwaysOnTop value="true" /> |
269 | </navigator> | 265 | </navigator> |
270 | <panes> | 266 | <panes> |
267 | + <pane id="Scratches" /> | ||
268 | + <pane id="Scope" /> | ||
271 | <pane id="ProjectPane"> | 269 | <pane id="ProjectPane"> |
272 | <subPane> | 270 | <subPane> |
273 | <expand> | 271 | <expand> |
@@ -278,27 +276,32 @@ | @@ -278,27 +276,32 @@ | ||
278 | <path> | 276 | <path> |
279 | <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | 277 | <item name="areial" type="b2602c69:ProjectViewProjectNode" /> |
280 | <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | 278 | <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> |
281 | - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> | 279 | + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> |
280 | + </path> | ||
281 | + <path> | ||
282 | + <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
283 | + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
284 | + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
285 | + <item name="uploads" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
282 | </path> | 286 | </path> |
283 | <path> | 287 | <path> |
284 | <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | 288 | <item name="areial" type="b2602c69:ProjectViewProjectNode" /> |
285 | <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | 289 | <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> |
286 | - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
287 | - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> | 290 | + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> |
291 | + <item name="uploads" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
292 | + <item name="20191118" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
288 | </path> | 293 | </path> |
289 | <path> | 294 | <path> |
290 | <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | 295 | <item name="areial" type="b2602c69:ProjectViewProjectNode" /> |
291 | <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | 296 | <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> |
292 | - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
293 | - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
294 | - <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> | 297 | + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> |
298 | + <item name="uploads" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
299 | + <item name="20191120" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
295 | </path> | 300 | </path> |
296 | </expand> | 301 | </expand> |
297 | <select /> | 302 | <select /> |
298 | </subPane> | 303 | </subPane> |
299 | </pane> | 304 | </pane> |
300 | - <pane id="Scope" /> | ||
301 | - <pane id="Scratches" /> | ||
302 | </panes> | 305 | </panes> |
303 | </component> | 306 | </component> |
304 | <component name="PropertiesComponent"> | 307 | <component name="PropertiesComponent"> |
@@ -308,6 +311,12 @@ | @@ -308,6 +311,12 @@ | ||
308 | <property name="settings.editor.selected.configurable" value="preferences.keymap" /> | 311 | <property name="settings.editor.selected.configurable" value="preferences.keymap" /> |
309 | </component> | 312 | </component> |
310 | <component name="RecentsManager"> | 313 | <component name="RecentsManager"> |
314 | + <key name="MoveFile.RECENT_KEYS"> | ||
315 | + <recent name="D:\htdocs\areial\public\uploads\20191120" /> | ||
316 | + <recent name="D:\htdocs\areial\public\uploads" /> | ||
317 | + <recent name="D:\htdocs\areial\public\cert" /> | ||
318 | + <recent name="D:\htdocs\areial\public\uploads\20191118" /> | ||
319 | + </key> | ||
311 | <key name="CopyFile.RECENT_KEYS"> | 320 | <key name="CopyFile.RECENT_KEYS"> |
312 | <recent name="D:\htdocs\areial\public\assets\js" /> | 321 | <recent name="D:\htdocs\areial\public\assets\js" /> |
313 | <recent name="D:\htdocs\areial\public\assets\libs\bootstrap-table\dist\extensions" /> | 322 | <recent name="D:\htdocs\areial\public\assets\libs\bootstrap-table\dist\extensions" /> |
@@ -315,12 +324,6 @@ | @@ -315,12 +324,6 @@ | ||
315 | <recent name="D:\htdocs\areial\extend" /> | 324 | <recent name="D:\htdocs\areial\extend" /> |
316 | <recent name="D:\htdocs\areial\public\uploads\20191118" /> | 325 | <recent name="D:\htdocs\areial\public\uploads\20191118" /> |
317 | </key> | 326 | </key> |
318 | - <key name="MoveFile.RECENT_KEYS"> | ||
319 | - <recent name="D:\htdocs\areial\public\uploads\20191120" /> | ||
320 | - <recent name="D:\htdocs\areial\public\uploads" /> | ||
321 | - <recent name="D:\htdocs\areial\public\cert" /> | ||
322 | - <recent name="D:\htdocs\areial\public\uploads\20191118" /> | ||
323 | - </key> | ||
324 | </component> | 327 | </component> |
325 | <component name="RunDashboard"> | 328 | <component name="RunDashboard"> |
326 | <option name="ruleStates"> | 329 | <option name="ruleStates"> |
@@ -440,6 +443,7 @@ | @@ -440,6 +443,7 @@ | ||
440 | <workItem from="1583848752159" duration="3638000" /> | 443 | <workItem from="1583848752159" duration="3638000" /> |
441 | <workItem from="1583886688361" duration="20321000" /> | 444 | <workItem from="1583886688361" duration="20321000" /> |
442 | <workItem from="1583922378448" duration="31000" /> | 445 | <workItem from="1583922378448" duration="31000" /> |
446 | + <workItem from="1583973595016" duration="138000" /> | ||
443 | </task> | 447 | </task> |
444 | <task id="LOCAL-00001" summary="调试"> | 448 | <task id="LOCAL-00001" summary="调试"> |
445 | <created>1574145133364</created> | 449 | <created>1574145133364</created> |
@@ -466,7 +470,7 @@ | @@ -466,7 +470,7 @@ | ||
466 | <servers /> | 470 | <servers /> |
467 | </component> | 471 | </component> |
468 | <component name="TimeTrackingManager"> | 472 | <component name="TimeTrackingManager"> |
469 | - <option name="totallyTimeSpent" value="617491000" /> | 473 | + <option name="totallyTimeSpent" value="617629000" /> |
470 | </component> | 474 | </component> |
471 | <component name="TodoView"> | 475 | <component name="TodoView"> |
472 | <todo-panel id="selected-file"> | 476 | <todo-panel id="selected-file"> |
@@ -478,16 +482,16 @@ | @@ -478,16 +482,16 @@ | ||
478 | </todo-panel> | 482 | </todo-panel> |
479 | </component> | 483 | </component> |
480 | <component name="ToolWindowManager"> | 484 | <component name="ToolWindowManager"> |
481 | - <frame x="-64" y="95" width="1652" height="916" extended-state="1" /> | 485 | + <frame x="199" y="83" width="1652" height="916" extended-state="1" /> |
482 | <layout> | 486 | <layout> |
483 | - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16708542" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> | 487 | + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16896985" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> |
484 | <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> | 488 | <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> |
485 | <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> | 489 | <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> |
486 | <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> | 490 | <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
487 | <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | 491 | <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
488 | <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> | 492 | <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> |
489 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | 493 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
490 | - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.46598202" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | 494 | + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4653846" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
491 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> | 495 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> |
492 | <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> | 496 | <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> |
493 | <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 497 | <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
public/uploads/20191120/hand.png
0 → 100644
2.5 KB
-
请 注册 或 登录 后发表评论