正在显示
2 个修改的文件
包含
205 行增加
和
127 行删除
@@ -7,7 +7,6 @@ | @@ -7,7 +7,6 @@ | ||
7 | <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> | 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" /> | 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/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> | 9 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> |
10 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/extra/verify.php" afterPath="$PROJECT_DIR$/application/extra/verify.php" /> | ||
11 | </list> | 10 | </list> |
12 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 11 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
13 | <option name="TRACKING_ENABLED" value="true" /> | 12 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -21,8 +20,8 @@ | @@ -21,8 +20,8 @@ | ||
21 | <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> | 20 | <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> |
22 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 21 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
23 | <provider selected="true" editor-type-id="text-editor"> | 22 | <provider selected="true" editor-type-id="text-editor"> |
24 | - <state relative-caret-position="544"> | ||
25 | - <caret line="681" column="39" lean-forward="false" selection-start-line="681" selection-start-column="39" selection-end-line="681" selection-end-column="39" /> | 23 | + <state relative-caret-position="218"> |
24 | + <caret line="730" column="13" lean-forward="true" selection-start-line="730" selection-start-column="13" selection-end-line="730" selection-end-column="13" /> | ||
26 | <folding> | 25 | <folding> |
27 | <element signature="e#535#1273#0#PHP" expanded="false" /> | 26 | <element signature="e#535#1273#0#PHP" expanded="false" /> |
28 | <element signature="e#1278#2941#0#PHP" expanded="false" /> | 27 | <element signature="e#1278#2941#0#PHP" expanded="false" /> |
@@ -51,66 +50,76 @@ | @@ -51,66 +50,76 @@ | ||
51 | <element signature="e#18462#19038#0#PHP" expanded="false" /> | 50 | <element signature="e#18462#19038#0#PHP" expanded="false" /> |
52 | <element signature="e#19043#19655#0#PHP" expanded="false" /> | 51 | <element signature="e#19043#19655#0#PHP" expanded="false" /> |
53 | <element signature="e#19661#20377#0#PHP" expanded="false" /> | 52 | <element signature="e#19661#20377#0#PHP" expanded="false" /> |
54 | - <element signature="e#22822#24772#0#PHP" expanded="false" /> | ||
55 | - <element signature="e#24787#25717#0#PHP" expanded="false" /> | ||
56 | - <element signature="e#25722#30863#0#PHP" expanded="false" /> | ||
57 | - <element signature="e#30869#31246#0#PHP" expanded="false" /> | ||
58 | - <element signature="e#31251#31690#0#PHP" expanded="false" /> | ||
59 | - <element signature="e#31696#32517#0#PHP" expanded="false" /> | ||
60 | - <element signature="e#32522#35926#0#PHP" expanded="false" /> | ||
61 | - <element signature="e#32968#35920#0#PHP" expanded="false" /> | ||
62 | - <element signature="e#35932#36437#0#PHP" expanded="false" /> | ||
63 | - <element signature="e#36442#36693#0#PHP" expanded="false" /> | ||
64 | - <element signature="e#36699#37178#0#PHP" expanded="false" /> | ||
65 | - <element signature="e#37183#37940#0#PHP" expanded="false" /> | ||
66 | - <element signature="e#37946#38427#0#PHP" expanded="false" /> | ||
67 | - <element signature="e#38432#39202#0#PHP" expanded="false" /> | ||
68 | - <element signature="e#39208#39571#0#PHP" expanded="false" /> | ||
69 | - <element signature="e#39576#39767#0#PHP" expanded="false" /> | ||
70 | - <element signature="e#39773#40131#0#PHP" expanded="false" /> | ||
71 | - <element signature="e#40136#40327#0#PHP" expanded="false" /> | ||
72 | - <element signature="e#40333#41476#0#PHP" expanded="false" /> | ||
73 | - <element signature="e#41481#44146#0#PHP" expanded="false" /> | ||
74 | - <element signature="e#44152#44650#0#PHP" expanded="false" /> | ||
75 | - <element signature="e#44655#46401#0#PHP" expanded="false" /> | ||
76 | - <element signature="e#46407#46820#0#PHP" expanded="false" /> | ||
77 | - <element signature="e#46825#47304#0#PHP" expanded="false" /> | ||
78 | - <element signature="e#47310#47844#0#PHP" expanded="false" /> | ||
79 | - <element signature="e#47849#49234#0#PHP" expanded="false" /> | ||
80 | - <element signature="e#49240#49894#0#PHP" expanded="false" /> | ||
81 | - <element signature="e#49899#51914#0#PHP" expanded="false" /> | ||
82 | - <element signature="e#51920#52680#0#PHP" expanded="false" /> | ||
83 | - <element signature="e#52685#55394#0#PHP" expanded="false" /> | ||
84 | - <element signature="e#55420#56251#0#PHP" expanded="false" /> | ||
85 | - <element signature="e#56257#56677#0#PHP" expanded="false" /> | ||
86 | - <element signature="e#56682#57165#0#PHP" expanded="false" /> | ||
87 | - <element signature="e#57171#57977#0#PHP" expanded="false" /> | ||
88 | - <element signature="e#57982#61140#0#PHP" expanded="false" /> | ||
89 | - <element signature="e#59775#61134#0#PHP" expanded="false" /> | ||
90 | - <element signature="e#61155#62490#0#PHP" expanded="false" /> | ||
91 | - <element signature="e#61271#61673#0#PHP" expanded="false" /> | ||
92 | - <element signature="e#62506#63540#0#PHP" expanded="false" /> | ||
93 | - <element signature="e#63546#64304#0#PHP" expanded="false" /> | ||
94 | - <element signature="e#64309#68052#0#PHP" expanded="false" /> | ||
95 | - <element signature="e#68058#68450#0#PHP" expanded="false" /> | ||
96 | - <element signature="e#68455#69407#0#PHP" expanded="false" /> | ||
97 | - <element signature="e#69431#70004#0#PHP" expanded="false" /> | ||
98 | - <element signature="e#70010#70609#0#PHP" expanded="false" /> | ||
99 | - <element signature="e#70614#71541#0#PHP" expanded="false" /> | ||
100 | - <element signature="e#71547#72261#0#PHP" expanded="false" /> | ||
101 | - <element signature="e#72267#72694#0#PHP" expanded="false" /> | ||
102 | - <element signature="e#72699#73168#0#PHP" expanded="false" /> | ||
103 | - <element signature="e#73175#74380#0#PHP" expanded="false" /> | ||
104 | - <element signature="e#74385#76088#0#PHP" expanded="false" /> | ||
105 | - <element signature="e#76094#76871#0#PHP" expanded="false" /> | ||
106 | - <element signature="e#76876#80814#0#PHP" expanded="false" /> | ||
107 | - <element signature="e#80820#81329#0#PHP" expanded="false" /> | ||
108 | - <element signature="e#81334#82006#0#PHP" expanded="false" /> | 53 | + <element signature="e#20643#25263#0#PHP" expanded="false" /> |
54 | + <element signature="e#25278#26208#0#PHP" expanded="false" /> | ||
55 | + <element signature="e#26213#31354#0#PHP" expanded="false" /> | ||
56 | + <element signature="e#31360#31737#0#PHP" expanded="false" /> | ||
57 | + <element signature="e#31742#32181#0#PHP" expanded="false" /> | ||
58 | + <element signature="e#32187#33008#0#PHP" expanded="false" /> | ||
59 | + <element signature="e#33013#36417#0#PHP" expanded="false" /> | ||
60 | + <element signature="e#33459#36411#0#PHP" expanded="false" /> | ||
61 | + <element signature="e#36423#36928#0#PHP" expanded="false" /> | ||
62 | + <element signature="e#36933#37184#0#PHP" expanded="false" /> | ||
63 | + <element signature="e#37190#37669#0#PHP" expanded="false" /> | ||
64 | + <element signature="e#37674#38431#0#PHP" expanded="false" /> | ||
65 | + <element signature="e#38437#38918#0#PHP" expanded="false" /> | ||
66 | + <element signature="e#38923#39693#0#PHP" expanded="false" /> | ||
67 | + <element signature="e#39699#40062#0#PHP" expanded="false" /> | ||
68 | + <element signature="e#40067#40258#0#PHP" expanded="false" /> | ||
69 | + <element signature="e#40264#40622#0#PHP" expanded="false" /> | ||
70 | + <element signature="e#40627#40818#0#PHP" expanded="false" /> | ||
71 | + <element signature="e#40824#41967#0#PHP" expanded="false" /> | ||
72 | + <element signature="e#41972#44637#0#PHP" expanded="false" /> | ||
73 | + <element signature="e#44643#45141#0#PHP" expanded="false" /> | ||
74 | + <element signature="e#45146#46892#0#PHP" expanded="false" /> | ||
75 | + <element signature="e#46898#47311#0#PHP" expanded="false" /> | ||
76 | + <element signature="e#47316#47795#0#PHP" expanded="false" /> | ||
77 | + <element signature="e#47801#48335#0#PHP" expanded="false" /> | ||
78 | + <element signature="e#48340#49725#0#PHP" expanded="false" /> | ||
79 | + <element signature="e#49731#50385#0#PHP" expanded="false" /> | ||
80 | + <element signature="e#50390#52405#0#PHP" expanded="false" /> | ||
81 | + <element signature="e#52411#53171#0#PHP" expanded="false" /> | ||
82 | + <element signature="e#53176#55885#0#PHP" expanded="false" /> | ||
83 | + <element signature="e#55911#56742#0#PHP" expanded="false" /> | ||
84 | + <element signature="e#56748#57168#0#PHP" expanded="false" /> | ||
85 | + <element signature="e#57173#57656#0#PHP" expanded="false" /> | ||
86 | + <element signature="e#57662#58468#0#PHP" expanded="false" /> | ||
87 | + <element signature="e#58473#61631#0#PHP" expanded="false" /> | ||
88 | + <element signature="e#60266#61625#0#PHP" expanded="false" /> | ||
89 | + <element signature="e#61646#62981#0#PHP" expanded="false" /> | ||
90 | + <element signature="e#61762#62164#0#PHP" expanded="false" /> | ||
91 | + <element signature="e#62997#64031#0#PHP" expanded="false" /> | ||
92 | + <element signature="e#64037#64795#0#PHP" expanded="false" /> | ||
93 | + <element signature="e#64800#68543#0#PHP" expanded="false" /> | ||
94 | + <element signature="e#68549#68941#0#PHP" expanded="false" /> | ||
95 | + <element signature="e#68946#69898#0#PHP" expanded="false" /> | ||
96 | + <element signature="e#69922#70495#0#PHP" expanded="false" /> | ||
97 | + <element signature="e#70501#71100#0#PHP" expanded="false" /> | ||
98 | + <element signature="e#71105#72032#0#PHP" expanded="false" /> | ||
99 | + <element signature="e#72038#72752#0#PHP" expanded="false" /> | ||
100 | + <element signature="e#72758#73185#0#PHP" expanded="false" /> | ||
101 | + <element signature="e#73190#73659#0#PHP" expanded="false" /> | ||
102 | + <element signature="e#73666#74871#0#PHP" expanded="false" /> | ||
103 | + <element signature="e#74876#76579#0#PHP" expanded="false" /> | ||
104 | + <element signature="e#76585#77362#0#PHP" expanded="false" /> | ||
105 | + <element signature="e#77367#81305#0#PHP" expanded="false" /> | ||
106 | + <element signature="e#81311#81820#0#PHP" expanded="false" /> | ||
107 | + <element signature="e#81825#82497#0#PHP" expanded="false" /> | ||
109 | </folding> | 108 | </folding> |
110 | </state> | 109 | </state> |
111 | </provider> | 110 | </provider> |
112 | </entry> | 111 | </entry> |
113 | </file> | 112 | </file> |
113 | + <file leaf-file-name="standard_5.php" pinned="false" current-in-tab="false"> | ||
114 | + <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_5.php"> | ||
115 | + <provider selected="true" editor-type-id="text-editor"> | ||
116 | + <state relative-caret-position="578"> | ||
117 | + <caret line="1121" column="9" lean-forward="false" selection-start-line="1121" selection-start-column="9" selection-end-line="1121" selection-end-column="9" /> | ||
118 | + <folding /> | ||
119 | + </state> | ||
120 | + </provider> | ||
121 | + </entry> | ||
122 | + </file> | ||
114 | <file leaf-file-name="verify.php" pinned="false" current-in-tab="false"> | 123 | <file leaf-file-name="verify.php" pinned="false" current-in-tab="false"> |
115 | <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> | 124 | <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> |
116 | <provider selected="true" editor-type-id="text-editor"> | 125 | <provider selected="true" editor-type-id="text-editor"> |
@@ -222,9 +231,9 @@ | @@ -222,9 +231,9 @@ | ||
222 | <sorting>DEFINITION_ORDER</sorting> | 231 | <sorting>DEFINITION_ORDER</sorting> |
223 | </component> | 232 | </component> |
224 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 233 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
225 | - <component name="ProjectFrameBounds"> | ||
226 | - <option name="x" value="675" /> | ||
227 | - <option name="y" value="44" /> | 234 | + <component name="ProjectFrameBounds" extendedState="1"> |
235 | + <option name="x" value="213" /> | ||
236 | + <option name="y" value="71" /> | ||
228 | <option name="width" value="1652" /> | 237 | <option name="width" value="1652" /> |
229 | <option name="height" value="930" /> | 238 | <option name="height" value="930" /> |
230 | </component> | 239 | </component> |
@@ -287,6 +296,13 @@ | @@ -287,6 +296,13 @@ | ||
287 | <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | 296 | <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> |
288 | <item name="uploads" type="2a2b976b:PhpTreeStructureProvider$1" /> | 297 | <item name="uploads" type="2a2b976b:PhpTreeStructureProvider$1" /> |
289 | </path> | 298 | </path> |
299 | + <path> | ||
300 | + <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
301 | + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
302 | + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
303 | + <item name="uploads" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
304 | + <item name="20200224" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
305 | + </path> | ||
290 | </expand> | 306 | </expand> |
291 | <select /> | 307 | <select /> |
292 | </subPane> | 308 | </subPane> |
@@ -444,7 +460,7 @@ | @@ -444,7 +460,7 @@ | ||
444 | <workItem from="1585220935766" duration="1086000" /> | 460 | <workItem from="1585220935766" duration="1086000" /> |
445 | <workItem from="1585528700995" duration="1288000" /> | 461 | <workItem from="1585528700995" duration="1288000" /> |
446 | <workItem from="1585557924309" duration="618000" /> | 462 | <workItem from="1585557924309" duration="618000" /> |
447 | - <workItem from="1585565173117" duration="1498000" /> | 463 | + <workItem from="1585565173117" duration="2442000" /> |
448 | </task> | 464 | </task> |
449 | <task id="LOCAL-00001" summary="调试"> | 465 | <task id="LOCAL-00001" summary="调试"> |
450 | <created>1574145133364</created> | 466 | <created>1574145133364</created> |
@@ -467,11 +483,53 @@ | @@ -467,11 +483,53 @@ | ||
467 | <option name="project" value="LOCAL" /> | 483 | <option name="project" value="LOCAL" /> |
468 | <updated>1575869422308</updated> | 484 | <updated>1575869422308</updated> |
469 | </task> | 485 | </task> |
470 | - <option name="localTasksCounter" value="4" /> | 486 | + <task id="LOCAL-00004" summary="文件下载调试"> |
487 | + <created>1585566917025</created> | ||
488 | + <option name="number" value="00004" /> | ||
489 | + <option name="presentableId" value="LOCAL-00004" /> | ||
490 | + <option name="project" value="LOCAL" /> | ||
491 | + <updated>1585566917025</updated> | ||
492 | + </task> | ||
493 | + <task id="LOCAL-00005" summary="文件下载调试"> | ||
494 | + <created>1585566969283</created> | ||
495 | + <option name="number" value="00005" /> | ||
496 | + <option name="presentableId" value="LOCAL-00005" /> | ||
497 | + <option name="project" value="LOCAL" /> | ||
498 | + <updated>1585566969283</updated> | ||
499 | + </task> | ||
500 | + <task id="LOCAL-00006" summary="文件下载调试"> | ||
501 | + <created>1585567077791</created> | ||
502 | + <option name="number" value="00006" /> | ||
503 | + <option name="presentableId" value="LOCAL-00006" /> | ||
504 | + <option name="project" value="LOCAL" /> | ||
505 | + <updated>1585567077791</updated> | ||
506 | + </task> | ||
507 | + <task id="LOCAL-00007" summary="文件下载调试"> | ||
508 | + <created>1585567103441</created> | ||
509 | + <option name="number" value="00007" /> | ||
510 | + <option name="presentableId" value="LOCAL-00007" /> | ||
511 | + <option name="project" value="LOCAL" /> | ||
512 | + <updated>1585567103441</updated> | ||
513 | + </task> | ||
514 | + <task id="LOCAL-00008" summary="文件下载调试"> | ||
515 | + <created>1585567221925</created> | ||
516 | + <option name="number" value="00008" /> | ||
517 | + <option name="presentableId" value="LOCAL-00008" /> | ||
518 | + <option name="project" value="LOCAL" /> | ||
519 | + <updated>1585567221925</updated> | ||
520 | + </task> | ||
521 | + <task id="LOCAL-00009" summary="文件下载调试"> | ||
522 | + <created>1585567332744</created> | ||
523 | + <option name="number" value="00009" /> | ||
524 | + <option name="presentableId" value="LOCAL-00009" /> | ||
525 | + <option name="project" value="LOCAL" /> | ||
526 | + <updated>1585567332744</updated> | ||
527 | + </task> | ||
528 | + <option name="localTasksCounter" value="10" /> | ||
471 | <servers /> | 529 | <servers /> |
472 | </component> | 530 | </component> |
473 | <component name="TimeTrackingManager"> | 531 | <component name="TimeTrackingManager"> |
474 | - <option name="totallyTimeSpent" value="646002000" /> | 532 | + <option name="totallyTimeSpent" value="646946000" /> |
475 | </component> | 533 | </component> |
476 | <component name="TodoView"> | 534 | <component name="TodoView"> |
477 | <todo-panel id="selected-file"> | 535 | <todo-panel id="selected-file"> |
@@ -483,10 +541,10 @@ | @@ -483,10 +541,10 @@ | ||
483 | </todo-panel> | 541 | </todo-panel> |
484 | </component> | 542 | </component> |
485 | <component name="ToolWindowManager"> | 543 | <component name="ToolWindowManager"> |
486 | - <frame x="675" y="44" width="1652" height="930" extended-state="0" /> | 544 | + <frame x="213" y="71" width="1652" height="930" extended-state="1" /> |
487 | <editor active="true" /> | 545 | <editor active="true" /> |
488 | <layout> | 546 | <layout> |
489 | - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16645728" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> | 547 | + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16645728" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> |
490 | <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" /> | 548 | <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" /> |
491 | <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" /> | 549 | <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" /> |
492 | <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" /> | 550 | <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" /> |
@@ -532,7 +590,8 @@ | @@ -532,7 +590,8 @@ | ||
532 | </component> | 590 | </component> |
533 | <component name="VcsManagerConfiguration"> | 591 | <component name="VcsManagerConfiguration"> |
534 | <MESSAGE value="调试" /> | 592 | <MESSAGE value="调试" /> |
535 | - <option name="LAST_COMMIT_MESSAGE" value="调试" /> | 593 | + <MESSAGE value="文件下载调试" /> |
594 | + <option name="LAST_COMMIT_MESSAGE" value="文件下载调试" /> | ||
536 | </component> | 595 | </component> |
537 | <component name="XDebuggerManager"> | 596 | <component name="XDebuggerManager"> |
538 | <breakpoint-manager> | 597 | <breakpoint-manager> |
@@ -541,8 +600,6 @@ | @@ -541,8 +600,6 @@ | ||
541 | <watches-manager /> | 600 | <watches-manager /> |
542 | </component> | 601 | </component> |
543 | <component name="editorHistoryManager"> | 602 | <component name="editorHistoryManager"> |
544 | - <entry file="file://$USER_HOME$/Desktop/新建文件夹/public/assets/js/require-table.js" /> | ||
545 | - <entry file="file://$USER_HOME$/Desktop/新建文件夹/public/assets/js/require-backend.js" /> | ||
546 | <entry file="file://$PROJECT_DIR$/public/assets/css/backend.css"> | 603 | <entry file="file://$PROJECT_DIR$/public/assets/css/backend.css"> |
547 | <provider selected="true" editor-type-id="text-editor"> | 604 | <provider selected="true" editor-type-id="text-editor"> |
548 | <state relative-caret-position="84"> | 605 | <state relative-caret-position="84"> |
@@ -917,10 +974,23 @@ | @@ -917,10 +974,23 @@ | ||
917 | </state> | 974 | </state> |
918 | </provider> | 975 | </provider> |
919 | </entry> | 976 | </entry> |
977 | + <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_5.php"> | ||
978 | + <provider selected="true" editor-type-id="text-editor"> | ||
979 | + <state relative-caret-position="578"> | ||
980 | + <caret line="1121" column="9" lean-forward="false" selection-start-line="1121" selection-start-column="9" selection-end-line="1121" selection-end-column="9" /> | ||
981 | + <folding /> | ||
982 | + </state> | ||
983 | + </provider> | ||
984 | + </entry> | ||
985 | + <entry file="file://$PROJECT_DIR$/public/uploads/20200224/FnP4bjIl2npbQgozzDqWFF8jSgyX.jpg"> | ||
986 | + <provider selected="true" editor-type-id="images"> | ||
987 | + <state /> | ||
988 | + </provider> | ||
989 | + </entry> | ||
920 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 990 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
921 | <provider selected="true" editor-type-id="text-editor"> | 991 | <provider selected="true" editor-type-id="text-editor"> |
922 | - <state relative-caret-position="544"> | ||
923 | - <caret line="681" column="39" lean-forward="false" selection-start-line="681" selection-start-column="39" selection-end-line="681" selection-end-column="39" /> | 992 | + <state relative-caret-position="218"> |
993 | + <caret line="730" column="13" lean-forward="true" selection-start-line="730" selection-start-column="13" selection-end-line="730" selection-end-column="13" /> | ||
924 | <folding> | 994 | <folding> |
925 | <element signature="e#535#1273#0#PHP" expanded="false" /> | 995 | <element signature="e#535#1273#0#PHP" expanded="false" /> |
926 | <element signature="e#1278#2941#0#PHP" expanded="false" /> | 996 | <element signature="e#1278#2941#0#PHP" expanded="false" /> |
@@ -949,61 +1019,61 @@ | @@ -949,61 +1019,61 @@ | ||
949 | <element signature="e#18462#19038#0#PHP" expanded="false" /> | 1019 | <element signature="e#18462#19038#0#PHP" expanded="false" /> |
950 | <element signature="e#19043#19655#0#PHP" expanded="false" /> | 1020 | <element signature="e#19043#19655#0#PHP" expanded="false" /> |
951 | <element signature="e#19661#20377#0#PHP" expanded="false" /> | 1021 | <element signature="e#19661#20377#0#PHP" expanded="false" /> |
952 | - <element signature="e#22822#24772#0#PHP" expanded="false" /> | ||
953 | - <element signature="e#24787#25717#0#PHP" expanded="false" /> | ||
954 | - <element signature="e#25722#30863#0#PHP" expanded="false" /> | ||
955 | - <element signature="e#30869#31246#0#PHP" expanded="false" /> | ||
956 | - <element signature="e#31251#31690#0#PHP" expanded="false" /> | ||
957 | - <element signature="e#31696#32517#0#PHP" expanded="false" /> | ||
958 | - <element signature="e#32522#35926#0#PHP" expanded="false" /> | ||
959 | - <element signature="e#32968#35920#0#PHP" expanded="false" /> | ||
960 | - <element signature="e#35932#36437#0#PHP" expanded="false" /> | ||
961 | - <element signature="e#36442#36693#0#PHP" expanded="false" /> | ||
962 | - <element signature="e#36699#37178#0#PHP" expanded="false" /> | ||
963 | - <element signature="e#37183#37940#0#PHP" expanded="false" /> | ||
964 | - <element signature="e#37946#38427#0#PHP" expanded="false" /> | ||
965 | - <element signature="e#38432#39202#0#PHP" expanded="false" /> | ||
966 | - <element signature="e#39208#39571#0#PHP" expanded="false" /> | ||
967 | - <element signature="e#39576#39767#0#PHP" expanded="false" /> | ||
968 | - <element signature="e#39773#40131#0#PHP" expanded="false" /> | ||
969 | - <element signature="e#40136#40327#0#PHP" expanded="false" /> | ||
970 | - <element signature="e#40333#41476#0#PHP" expanded="false" /> | ||
971 | - <element signature="e#41481#44146#0#PHP" expanded="false" /> | ||
972 | - <element signature="e#44152#44650#0#PHP" expanded="false" /> | ||
973 | - <element signature="e#44655#46401#0#PHP" expanded="false" /> | ||
974 | - <element signature="e#46407#46820#0#PHP" expanded="false" /> | ||
975 | - <element signature="e#46825#47304#0#PHP" expanded="false" /> | ||
976 | - <element signature="e#47310#47844#0#PHP" expanded="false" /> | ||
977 | - <element signature="e#47849#49234#0#PHP" expanded="false" /> | ||
978 | - <element signature="e#49240#49894#0#PHP" expanded="false" /> | ||
979 | - <element signature="e#49899#51914#0#PHP" expanded="false" /> | ||
980 | - <element signature="e#51920#52680#0#PHP" expanded="false" /> | ||
981 | - <element signature="e#52685#55394#0#PHP" expanded="false" /> | ||
982 | - <element signature="e#55420#56251#0#PHP" expanded="false" /> | ||
983 | - <element signature="e#56257#56677#0#PHP" expanded="false" /> | ||
984 | - <element signature="e#56682#57165#0#PHP" expanded="false" /> | ||
985 | - <element signature="e#57171#57977#0#PHP" expanded="false" /> | ||
986 | - <element signature="e#57982#61140#0#PHP" expanded="false" /> | ||
987 | - <element signature="e#59775#61134#0#PHP" expanded="false" /> | ||
988 | - <element signature="e#61155#62490#0#PHP" expanded="false" /> | ||
989 | - <element signature="e#61271#61673#0#PHP" expanded="false" /> | ||
990 | - <element signature="e#62506#63540#0#PHP" expanded="false" /> | ||
991 | - <element signature="e#63546#64304#0#PHP" expanded="false" /> | ||
992 | - <element signature="e#64309#68052#0#PHP" expanded="false" /> | ||
993 | - <element signature="e#68058#68450#0#PHP" expanded="false" /> | ||
994 | - <element signature="e#68455#69407#0#PHP" expanded="false" /> | ||
995 | - <element signature="e#69431#70004#0#PHP" expanded="false" /> | ||
996 | - <element signature="e#70010#70609#0#PHP" expanded="false" /> | ||
997 | - <element signature="e#70614#71541#0#PHP" expanded="false" /> | ||
998 | - <element signature="e#71547#72261#0#PHP" expanded="false" /> | ||
999 | - <element signature="e#72267#72694#0#PHP" expanded="false" /> | ||
1000 | - <element signature="e#72699#73168#0#PHP" expanded="false" /> | ||
1001 | - <element signature="e#73175#74380#0#PHP" expanded="false" /> | ||
1002 | - <element signature="e#74385#76088#0#PHP" expanded="false" /> | ||
1003 | - <element signature="e#76094#76871#0#PHP" expanded="false" /> | ||
1004 | - <element signature="e#76876#80814#0#PHP" expanded="false" /> | ||
1005 | - <element signature="e#80820#81329#0#PHP" expanded="false" /> | ||
1006 | - <element signature="e#81334#82006#0#PHP" expanded="false" /> | 1022 | + <element signature="e#20643#25263#0#PHP" expanded="false" /> |
1023 | + <element signature="e#25278#26208#0#PHP" expanded="false" /> | ||
1024 | + <element signature="e#26213#31354#0#PHP" expanded="false" /> | ||
1025 | + <element signature="e#31360#31737#0#PHP" expanded="false" /> | ||
1026 | + <element signature="e#31742#32181#0#PHP" expanded="false" /> | ||
1027 | + <element signature="e#32187#33008#0#PHP" expanded="false" /> | ||
1028 | + <element signature="e#33013#36417#0#PHP" expanded="false" /> | ||
1029 | + <element signature="e#33459#36411#0#PHP" expanded="false" /> | ||
1030 | + <element signature="e#36423#36928#0#PHP" expanded="false" /> | ||
1031 | + <element signature="e#36933#37184#0#PHP" expanded="false" /> | ||
1032 | + <element signature="e#37190#37669#0#PHP" expanded="false" /> | ||
1033 | + <element signature="e#37674#38431#0#PHP" expanded="false" /> | ||
1034 | + <element signature="e#38437#38918#0#PHP" expanded="false" /> | ||
1035 | + <element signature="e#38923#39693#0#PHP" expanded="false" /> | ||
1036 | + <element signature="e#39699#40062#0#PHP" expanded="false" /> | ||
1037 | + <element signature="e#40067#40258#0#PHP" expanded="false" /> | ||
1038 | + <element signature="e#40264#40622#0#PHP" expanded="false" /> | ||
1039 | + <element signature="e#40627#40818#0#PHP" expanded="false" /> | ||
1040 | + <element signature="e#40824#41967#0#PHP" expanded="false" /> | ||
1041 | + <element signature="e#41972#44637#0#PHP" expanded="false" /> | ||
1042 | + <element signature="e#44643#45141#0#PHP" expanded="false" /> | ||
1043 | + <element signature="e#45146#46892#0#PHP" expanded="false" /> | ||
1044 | + <element signature="e#46898#47311#0#PHP" expanded="false" /> | ||
1045 | + <element signature="e#47316#47795#0#PHP" expanded="false" /> | ||
1046 | + <element signature="e#47801#48335#0#PHP" expanded="false" /> | ||
1047 | + <element signature="e#48340#49725#0#PHP" expanded="false" /> | ||
1048 | + <element signature="e#49731#50385#0#PHP" expanded="false" /> | ||
1049 | + <element signature="e#50390#52405#0#PHP" expanded="false" /> | ||
1050 | + <element signature="e#52411#53171#0#PHP" expanded="false" /> | ||
1051 | + <element signature="e#53176#55885#0#PHP" expanded="false" /> | ||
1052 | + <element signature="e#55911#56742#0#PHP" expanded="false" /> | ||
1053 | + <element signature="e#56748#57168#0#PHP" expanded="false" /> | ||
1054 | + <element signature="e#57173#57656#0#PHP" expanded="false" /> | ||
1055 | + <element signature="e#57662#58468#0#PHP" expanded="false" /> | ||
1056 | + <element signature="e#58473#61631#0#PHP" expanded="false" /> | ||
1057 | + <element signature="e#60266#61625#0#PHP" expanded="false" /> | ||
1058 | + <element signature="e#61646#62981#0#PHP" expanded="false" /> | ||
1059 | + <element signature="e#61762#62164#0#PHP" expanded="false" /> | ||
1060 | + <element signature="e#62997#64031#0#PHP" expanded="false" /> | ||
1061 | + <element signature="e#64037#64795#0#PHP" expanded="false" /> | ||
1062 | + <element signature="e#64800#68543#0#PHP" expanded="false" /> | ||
1063 | + <element signature="e#68549#68941#0#PHP" expanded="false" /> | ||
1064 | + <element signature="e#68946#69898#0#PHP" expanded="false" /> | ||
1065 | + <element signature="e#69922#70495#0#PHP" expanded="false" /> | ||
1066 | + <element signature="e#70501#71100#0#PHP" expanded="false" /> | ||
1067 | + <element signature="e#71105#72032#0#PHP" expanded="false" /> | ||
1068 | + <element signature="e#72038#72752#0#PHP" expanded="false" /> | ||
1069 | + <element signature="e#72758#73185#0#PHP" expanded="false" /> | ||
1070 | + <element signature="e#73190#73659#0#PHP" expanded="false" /> | ||
1071 | + <element signature="e#73666#74871#0#PHP" expanded="false" /> | ||
1072 | + <element signature="e#74876#76579#0#PHP" expanded="false" /> | ||
1073 | + <element signature="e#76585#77362#0#PHP" expanded="false" /> | ||
1074 | + <element signature="e#77367#81305#0#PHP" expanded="false" /> | ||
1075 | + <element signature="e#81311#81820#0#PHP" expanded="false" /> | ||
1076 | + <element signature="e#81825#82497#0#PHP" expanded="false" /> | ||
1007 | </folding> | 1077 | </folding> |
1008 | </state> | 1078 | </state> |
1009 | </provider> | 1079 | </provider> |
@@ -729,11 +729,19 @@ class User extends Api | @@ -729,11 +729,19 @@ class User extends Api | ||
729 | unset($data['keyword'][$k]); | 729 | unset($data['keyword'][$k]); |
730 | } | 730 | } |
731 | } | 731 | } |
732 | + $base_url = $data['water_url']; | ||
732 | $click_num = $data['click_num'] + 1; | 733 | $click_num = $data['click_num'] + 1; |
733 | Db::name('pic')->where('id',$pic_id)->update(['click_num'=>$click_num]); | 734 | Db::name('pic')->where('id',$pic_id)->update(['click_num'=>$click_num]); |
734 | $data['is_vip'] = 1; | 735 | $data['is_vip'] = 1; |
735 | $data['accredit'] = $rule.$accredit['thumbnail']; | 736 | $data['accredit'] = $rule.$accredit['thumbnail']; |
736 | - $data['water_url'] = $rule.$data['water_url']; | 737 | + $qiniu_url = $rule.$data['water_url']; |
738 | + $a = file_get_contents($qiniu_url); | ||
739 | + $path = './uploads/'.explode('/',$base_url)[2].'/'; | ||
740 | + if(!file_exists($path)){ | ||
741 | + mkdir($path,0777,true); | ||
742 | + } | ||
743 | + file_put_contents('.'.$base_url,$a); | ||
744 | + $data['water_url'] = request()->domain().$data['water_url']; | ||
737 | $data['vip_price'] = $data['price'] * 0.75; | 745 | $data['vip_price'] = $data['price'] * 0.75; |
738 | $data['thumbnail'] = $rule.$data['thumbnail']; | 746 | $data['thumbnail'] = $rule.$data['thumbnail']; |
739 | $this->success('SUCCESS',$data); | 747 | $this->success('SUCCESS',$data); |
-
请 注册 或 登录 后发表评论