作者 郭盛
1 个管道 的构建 通过 耗费 1 秒

用户头像

@@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment=""> 4 <list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment="">
5 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/tou.png" />  
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OtherController.php" afterPath="$PROJECT_DIR$/api/index/controller/OtherController.php" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OtherController.php" afterPath="$PROJECT_DIR$/api/index/controller/OtherController.php" />
8 </list> 7 </list>
@@ -18,8 +17,8 @@ @@ -18,8 +17,8 @@
18 <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="true"> 17 <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="true">
19 <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> 18 <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php">
20 <provider selected="true" editor-type-id="text-editor"> 19 <provider selected="true" editor-type-id="text-editor">
21 - <state relative-caret-position="257">  
22 - <caret line="328" column="62" lean-forward="true" selection-start-line="328" selection-start-column="62" selection-end-line="328" selection-end-column="62" /> 20 + <state relative-caret-position="82">
  21 + <caret line="312" column="58" lean-forward="true" selection-start-line="312" selection-start-column="58" selection-end-line="312" selection-end-column="58" />
23 <folding> 22 <folding>
24 <element signature="e#129#158#0#PHP" expanded="true" /> 23 <element signature="e#129#158#0#PHP" expanded="true" />
25 <element signature="e#344#512#0#PHP" expanded="false" /> 24 <element signature="e#344#512#0#PHP" expanded="false" />
@@ -38,16 +37,24 @@ @@ -38,16 +37,24 @@
38 <element signature="e#6020#6946#0#PHP" expanded="false" /> 37 <element signature="e#6020#6946#0#PHP" expanded="false" />
39 <element signature="e#6952#7256#0#PHP" expanded="false" /> 38 <element signature="e#6952#7256#0#PHP" expanded="false" />
40 <element signature="e#7261#7650#0#PHP" expanded="false" /> 39 <element signature="e#7261#7650#0#PHP" expanded="false" />
41 - <element signature="e#10737#11528#0#PHP" expanded="false" />  
42 - <element signature="e#11548#12412#0#PHP" expanded="false" />  
43 - <element signature="e#12439#12839#0#PHP" expanded="false" />  
44 - <element signature="e#12863#13436#0#PHP" expanded="false" />  
45 - <element signature="e#13459#14269#0#PHP" expanded="false" /> 40 + <element signature="e#10378#10806#0#PHP" expanded="false" />
  41 + <element signature="e#10811#11602#0#PHP" expanded="false" />
  42 + <element signature="e#11622#12486#0#PHP" expanded="false" />
  43 + <element signature="e#12513#12913#0#PHP" expanded="false" />
  44 + <element signature="e#12937#13510#0#PHP" expanded="false" />
  45 + <element signature="e#13533#14343#0#PHP" expanded="false" />
46 </folding> 46 </folding>
47 </state> 47 </state>
48 </provider> 48 </provider>
49 </entry> 49 </entry>
50 </file> 50 </file>
  51 + <file leaf-file-name="poster_14_22.png" pinned="false" current-in-tab="false">
  52 + <entry file="file://$PROJECT_DIR$/public/upload/poster/poster_14_22.png">
  53 + <provider selected="true" editor-type-id="images">
  54 + <state />
  55 + </provider>
  56 + </entry>
  57 + </file>
51 </leaf> 58 </leaf>
52 </component> 59 </component>
53 <component name="FileTemplateManagerImpl"> 60 <component name="FileTemplateManagerImpl">
@@ -127,9 +134,9 @@ @@ -127,9 +134,9 @@
127 <sorting>DEFINITION_ORDER</sorting> 134 <sorting>DEFINITION_ORDER</sorting>
128 </component> 135 </component>
129 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 136 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
130 - <component name="ProjectFrameBounds">  
131 - <option name="x" value="-60" />  
132 - <option name="y" value="86" /> 137 + <component name="ProjectFrameBounds" extendedState="1">
  138 + <option name="x" value="97" />
  139 + <option name="y" value="76" />
133 <option name="width" value="1868" /> 140 <option name="width" value="1868" />
134 <option name="height" value="1019" /> 141 <option name="height" value="1019" />
135 </component> 142 </component>
@@ -148,8 +155,8 @@ @@ -148,8 +155,8 @@
148 <foldersAlwaysOnTop value="true" /> 155 <foldersAlwaysOnTop value="true" />
149 </navigator> 156 </navigator>
150 <panes> 157 <panes>
151 - <pane id="Scope" />  
152 <pane id="Scratches" /> 158 <pane id="Scratches" />
  159 + <pane id="Scope" />
153 <pane id="ProjectPane"> 160 <pane id="ProjectPane">
154 <subPane> 161 <subPane>
155 <expand> 162 <expand>
@@ -255,26 +262,27 @@ @@ -255,26 +262,27 @@
255 <workItem from="1569494185536" duration="1054000" /> 262 <workItem from="1569494185536" duration="1054000" />
256 <workItem from="1569544728303" duration="25104000" /> 263 <workItem from="1569544728303" duration="25104000" />
257 <workItem from="1569716359574" duration="28303000" /> 264 <workItem from="1569716359574" duration="28303000" />
  265 + <workItem from="1569751435531" duration="2736000" />
258 </task> 266 </task>
259 <servers /> 267 <servers />
260 </component> 268 </component>
261 <component name="TimeTrackingManager"> 269 <component name="TimeTrackingManager">
262 - <option name="totallyTimeSpent" value="427294000" /> 270 + <option name="totallyTimeSpent" value="430030000" />
263 </component> 271 </component>
264 <component name="ToolWindowManager"> 272 <component name="ToolWindowManager">
265 - <frame x="-60" y="86" width="1868" height="1019" extended-state="0" /> 273 + <frame x="97" y="76" width="1868" height="1019" extended-state="1" />
266 <editor active="true" /> 274 <editor active="true" />
267 <layout> 275 <layout>
268 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18086283" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 276 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18252212" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
269 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" /> 277 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
270 <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.34076828" sideWeight="0.50296295" order="7" side_tool="true" content_ui="tabs" /> 278 <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.34076828" sideWeight="0.50296295" order="7" side_tool="true" content_ui="tabs" />
271 <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="3" side_tool="false" content_ui="tabs" /> 279 <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="3" side_tool="false" content_ui="tabs" />
272 - <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="2" side_tool="false" content_ui="tabs" />  
273 <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="7" side_tool="false" content_ui="tabs" /> 280 <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="7" side_tool="false" content_ui="tabs" />
  281 + <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="2" side_tool="false" content_ui="tabs" />
274 <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="1" side_tool="false" content_ui="tabs" /> 282 <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="1" side_tool="false" content_ui="tabs" />
275 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2992383" sideWeight="0.49703702" order="7" side_tool="false" content_ui="tabs" /> 283 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2992383" sideWeight="0.49703702" order="7" side_tool="false" content_ui="tabs" />
276 - <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="3" side_tool="false" content_ui="tabs" />  
277 <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="2" side_tool="true" content_ui="tabs" /> 284 <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="2" side_tool="true" content_ui="tabs" />
  285 + <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="3" side_tool="false" content_ui="tabs" />
278 <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="4" side_tool="false" content_ui="tabs" /> 286 <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="4" side_tool="false" content_ui="tabs" />
279 <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" /> 287 <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
280 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 288 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -297,20 +305,6 @@ @@ -297,20 +305,6 @@
297 <watches-manager /> 305 <watches-manager />
298 </component> 306 </component>
299 <component name="editorHistoryManager"> 307 <component name="editorHistoryManager">
300 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html">  
301 - <provider selected="true" editor-type-id="text-editor">  
302 - <state relative-caret-position="126">  
303 - <caret line="131" column="0" lean-forward="false" selection-start-line="131" selection-start-column="0" selection-end-line="209" selection-end-column="9" />  
304 - </state>  
305 - </provider>  
306 - </entry>  
307 - <entry file="file://$PROJECT_DIR$/app/admin/controller/StatisticController.php">  
308 - <provider selected="true" editor-type-id="text-editor">  
309 - <state relative-caret-position="153">  
310 - <caret line="20" column="27" lean-forward="false" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />  
311 - </state>  
312 - </provider>  
313 - </entry>  
314 <entry file="file://$PROJECT_DIR$/app/admin/controller/FinancsendController.php"> 308 <entry file="file://$PROJECT_DIR$/app/admin/controller/FinancsendController.php">
315 <provider selected="true" editor-type-id="text-editor"> 309 <provider selected="true" editor-type-id="text-editor">
316 <state relative-caret-position="725"> 310 <state relative-caret-position="725">
@@ -494,7 +488,6 @@ @@ -494,7 +488,6 @@
494 <provider selected="true" editor-type-id="text-editor"> 488 <provider selected="true" editor-type-id="text-editor">
495 <state relative-caret-position="274"> 489 <state relative-caret-position="274">
496 <caret line="248" column="6" lean-forward="true" selection-start-line="248" selection-start-column="6" selection-end-line="248" selection-end-column="6" /> 490 <caret line="248" column="6" lean-forward="true" selection-start-line="248" selection-start-column="6" selection-end-line="248" selection-end-column="6" />
497 - <folding />  
498 </state> 491 </state>
499 </provider> 492 </provider>
500 </entry> 493 </entry>
@@ -524,60 +517,14 @@ @@ -524,60 +517,14 @@
524 <provider selected="true" editor-type-id="text-editor"> 517 <provider selected="true" editor-type-id="text-editor">
525 <state relative-caret-position="224"> 518 <state relative-caret-position="224">
526 <caret line="60" column="8" lean-forward="true" selection-start-line="60" selection-start-column="8" selection-end-line="73" selection-end-column="9" /> 519 <caret line="60" column="8" lean-forward="true" selection-start-line="60" selection-start-column="8" selection-end-line="73" selection-end-column="9" />
527 - <folding>  
528 - <element signature="e#346#543#0#PHP" expanded="false" />  
529 - <element signature="e#548#956#0#PHP" expanded="false" />  
530 - <element signature="e#962#1253#0#PHP" expanded="false" />  
531 - <element signature="e#4216#4690#0#PHP" expanded="false" />  
532 - <element signature="e#4697#5696#0#PHP" expanded="false" />  
533 - <element signature="e#5702#6355#0#PHP" expanded="false" />  
534 - <element signature="e#6360#7517#0#PHP" expanded="false" />  
535 - <element signature="e#7523#8226#0#PHP" expanded="false" />  
536 - <element signature="e#8231#9868#0#PHP" expanded="false" />  
537 - <element signature="e#9874#10732#0#PHP" expanded="false" />  
538 - <element signature="e#10737#12675#0#PHP" expanded="false" />  
539 - <element signature="e#12681#13521#0#PHP" expanded="false" />  
540 - <element signature="e#13526#15631#0#PHP" expanded="false" />  
541 - <element signature="e#15637#16284#0#PHP" expanded="false" />  
542 - <element signature="e#16289#17904#0#PHP" expanded="false" />  
543 - <element signature="e#17910#18326#0#PHP" expanded="false" />  
544 - <element signature="e#18331#19150#0#PHP" expanded="false" />  
545 - <element signature="e#19155#19833#0#PHP" expanded="false" />  
546 - <element signature="e#19839#20293#0#PHP" expanded="false" />  
547 - <element signature="e#20298#21156#0#PHP" expanded="false" />  
548 - <element signature="e#21162#21668#0#PHP" expanded="false" />  
549 - <element signature="e#21673#23104#0#PHP" expanded="false" />  
550 - <element signature="e#23110#23389#0#PHP" expanded="false" />  
551 - <element signature="e#23394#23836#0#PHP" expanded="false" />  
552 - <element signature="e#23842#24076#0#PHP" expanded="false" />  
553 - <element signature="e#24081#24474#0#PHP" expanded="false" />  
554 - <element signature="e#24480#24711#0#PHP" expanded="false" />  
555 - <element signature="e#24716#25074#0#PHP" expanded="false" />  
556 - </folding>  
557 </state> 520 </state>
558 </provider> 521 </provider>
559 </entry> 522 </entry>
560 - <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_14_22.jpg">  
561 - <provider selected="true" editor-type-id="images">  
562 - <state />  
563 - </provider>  
564 - </entry> 523 + <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_14_22.jpg" />
565 <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> 524 <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php">
566 <provider selected="true" editor-type-id="text-editor"> 525 <provider selected="true" editor-type-id="text-editor">
567 <state relative-caret-position="349"> 526 <state relative-caret-position="349">
568 <caret line="21" column="7" lean-forward="false" selection-start-line="21" selection-start-column="7" selection-end-line="21" selection-end-column="7" /> 527 <caret line="21" column="7" lean-forward="false" selection-start-line="21" selection-start-column="7" selection-end-line="21" selection-end-column="7" />
569 - <folding>  
570 - <element signature="e#296#1102#0#PHP" expanded="false" />  
571 - <element signature="e#1108#2740#0#PHP" expanded="false" />  
572 - <element signature="e#2746#2930#0#PHP" expanded="false" />  
573 - <element signature="e#2935#3427#0#PHP" expanded="false" />  
574 - <element signature="e#3433#4607#0#PHP" expanded="false" />  
575 - <element signature="e#4612#6545#0#PHP" expanded="false" />  
576 - <element signature="e#6551#7483#0#PHP" expanded="false" />  
577 - <element signature="e#7488#9131#0#PHP" expanded="false" />  
578 - <element signature="e#9137#9946#0#PHP" expanded="false" />  
579 - <element signature="e#9951#11545#0#PHP" expanded="false" />  
580 - </folding>  
581 </state> 528 </state>
582 </provider> 529 </provider>
583 </entry> 530 </entry>
@@ -585,13 +532,6 @@ @@ -585,13 +532,6 @@
585 <provider selected="true" editor-type-id="text-editor"> 532 <provider selected="true" editor-type-id="text-editor">
586 <state relative-caret-position="174"> 533 <state relative-caret-position="174">
587 <caret line="22" column="7" lean-forward="false" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" /> 534 <caret line="22" column="7" lean-forward="false" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" />
588 - <folding>  
589 - <element signature="e#767#1496#0#PHP" expanded="false" />  
590 - <element signature="e#1502#2191#0#PHP" expanded="false" />  
591 - <element signature="e#2196#4102#0#PHP" expanded="false" />  
592 - <element signature="e#4108#4373#0#PHP" expanded="false" />  
593 - <element signature="e#4378#4728#0#PHP" expanded="false" />  
594 - </folding>  
595 </state> 535 </state>
596 </provider> 536 </provider>
597 </entry> 537 </entry>
@@ -599,7 +539,6 @@ @@ -599,7 +539,6 @@
599 <provider selected="true" editor-type-id="text-editor"> 539 <provider selected="true" editor-type-id="text-editor">
600 <state relative-caret-position="-176"> 540 <state relative-caret-position="-176">
601 <caret line="43" column="27" lean-forward="false" selection-start-line="43" selection-start-column="27" selection-end-line="43" selection-end-column="27" /> 541 <caret line="43" column="27" lean-forward="false" selection-start-line="43" selection-start-column="27" selection-end-line="43" selection-end-column="27" />
602 - <folding />  
603 </state> 542 </state>
604 </provider> 543 </provider>
605 </entry> 544 </entry>
@@ -607,7 +546,6 @@ @@ -607,7 +546,6 @@
607 <provider selected="true" editor-type-id="text-editor"> 546 <provider selected="true" editor-type-id="text-editor">
608 <state relative-caret-position="275"> 547 <state relative-caret-position="275">
609 <caret line="219" column="16" lean-forward="true" selection-start-line="219" selection-start-column="16" selection-end-line="219" selection-end-column="16" /> 548 <caret line="219" column="16" lean-forward="true" selection-start-line="219" selection-start-column="16" selection-end-line="219" selection-end-column="16" />
610 - <folding />  
611 </state> 549 </state>
612 </provider> 550 </provider>
613 </entry> 551 </entry>
@@ -615,20 +553,9 @@ @@ -615,20 +553,9 @@
615 <provider selected="true" editor-type-id="text-editor"> 553 <provider selected="true" editor-type-id="text-editor">
616 <state relative-caret-position="499"> 554 <state relative-caret-position="499">
617 <caret line="123" column="20" lean-forward="true" selection-start-line="123" selection-start-column="20" selection-end-line="123" selection-end-column="20" /> 555 <caret line="123" column="20" lean-forward="true" selection-start-line="123" selection-start-column="20" selection-end-line="123" selection-end-column="20" />
618 - <folding />  
619 </state> 556 </state>
620 </provider> 557 </provider>
621 </entry> 558 </entry>
622 - <entry file="file://$PROJECT_DIR$/public/upload/poster/poster_11_22.png">  
623 - <provider selected="true" editor-type-id="images">  
624 - <state />  
625 - </provider>  
626 - </entry>  
627 - <entry file="file://$PROJECT_DIR$/public/upload/poster/poster_14_22.png">  
628 - <provider selected="true" editor-type-id="images">  
629 - <state />  
630 - </provider>  
631 - </entry>  
632 <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php"> 559 <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
633 <provider selected="true" editor-type-id="text-editor"> 560 <provider selected="true" editor-type-id="text-editor">
634 <state relative-caret-position="10231"> 561 <state relative-caret-position="10231">
@@ -641,7 +568,6 @@ @@ -641,7 +568,6 @@
641 <provider selected="true" editor-type-id="text-editor"> 568 <provider selected="true" editor-type-id="text-editor">
642 <state relative-caret-position="1300"> 569 <state relative-caret-position="1300">
643 <caret line="69" column="13" lean-forward="true" selection-start-line="69" selection-start-column="13" selection-end-line="69" selection-end-column="13" /> 570 <caret line="69" column="13" lean-forward="true" selection-start-line="69" selection-start-column="13" selection-end-line="69" selection-end-column="13" />
644 - <folding />  
645 </state> 571 </state>
646 </provider> 572 </provider>
647 </entry> 573 </entry>
@@ -649,7 +575,6 @@ @@ -649,7 +575,6 @@
649 <provider selected="true" editor-type-id="text-editor"> 575 <provider selected="true" editor-type-id="text-editor">
650 <state relative-caret-position="294"> 576 <state relative-caret-position="294">
651 <caret line="2549" column="9" lean-forward="false" selection-start-line="2549" selection-start-column="9" selection-end-line="2549" selection-end-column="9" /> 577 <caret line="2549" column="9" lean-forward="false" selection-start-line="2549" selection-start-column="9" selection-end-line="2549" selection-end-column="9" />
652 - <folding />  
653 </state> 578 </state>
654 </provider> 579 </provider>
655 </entry> 580 </entry>
@@ -657,56 +582,58 @@ @@ -657,56 +582,58 @@
657 <provider selected="true" editor-type-id="text-editor"> 582 <provider selected="true" editor-type-id="text-editor">
658 <state relative-caret-position="684"> 583 <state relative-caret-position="684">
659 <caret line="633" column="0" lean-forward="true" selection-start-line="633" selection-start-column="0" selection-end-line="633" selection-end-column="0" /> 584 <caret line="633" column="0" lean-forward="true" selection-start-line="633" selection-start-column="0" selection-end-line="633" selection-end-column="0" />
660 - <folding>  
661 - <element signature="e#330#916#0#PHP" expanded="false" />  
662 - <element signature="e#921#1852#0#PHP" expanded="false" />  
663 - <element signature="e#1858#2458#0#PHP" expanded="false" />  
664 - <element signature="e#2463#4046#0#PHP" expanded="false" />  
665 - <element signature="e#4052#5044#0#PHP" expanded="false" />  
666 - <element signature="e#5049#6284#0#PHP" expanded="false" />  
667 - <element signature="e#6290#6899#0#PHP" expanded="false" />  
668 - <element signature="e#6904#8090#0#PHP" expanded="false" />  
669 - <element signature="e#8096#8619#0#PHP" expanded="false" />  
670 - <element signature="e#8624#9157#0#PHP" expanded="false" />  
671 - <element signature="e#9163#9683#0#PHP" expanded="false" />  
672 - <element signature="e#9688#10261#0#PHP" expanded="false" />  
673 - <element signature="e#10267#10534#0#PHP" expanded="false" />  
674 - <element signature="e#10539#15152#0#PHP" expanded="false" />  
675 - <element signature="e#15158#15422#0#PHP" expanded="false" />  
676 - <element signature="e#15427#20222#0#PHP" expanded="false" />  
677 - </folding>  
678 </state> 585 </state>
679 </provider> 586 </provider>
680 </entry> 587 </entry>
681 - <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_11_22.jpg"> 588 + <entry file="file://$PROJECT_DIR$/public/bg.png">
  589 + <provider selected="true" editor-type-id="images">
  590 + <state />
  591 + </provider>
  592 + </entry>
  593 + <entry file="file://$PROJECT_DIR$/public/tou.png">
  594 + <provider selected="true" editor-type-id="images">
  595 + <state />
  596 + </provider>
  597 + </entry>
  598 + <entry file="file://$PROJECT_DIR$/public/upload/qrcode/1569753725.jpg">
682 <provider selected="true" editor-type-id="images"> 599 <provider selected="true" editor-type-id="images">
683 <state /> 600 <state />
684 </provider> 601 </provider>
685 </entry> 602 </entry>
686 <entry file="file://$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php"> 603 <entry file="file://$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php">
687 <provider selected="true" editor-type-id="text-editor"> 604 <provider selected="true" editor-type-id="text-editor">
688 - <state relative-caret-position="684">  
689 - <caret line="384" column="20" lean-forward="false" selection-start-line="384" selection-start-column="20" selection-end-line="384" selection-end-column="20" /> 605 + <state relative-caret-position="610">
  606 + <caret line="306" column="22" lean-forward="true" selection-start-line="306" selection-start-column="22" selection-end-line="306" selection-end-column="22" />
690 <folding> 607 <folding>
691 <element signature="e#616#660#0#PHP" expanded="true" /> 608 <element signature="e#616#660#0#PHP" expanded="true" />
692 </folding> 609 </folding>
693 </state> 610 </state>
694 </provider> 611 </provider>
695 </entry> 612 </entry>
696 - <entry file="file://$PROJECT_DIR$/public/bg.png"> 613 + <entry file="file://$PROJECT_DIR$/public/upload/poster/poster_14_22.png">
697 <provider selected="true" editor-type-id="images"> 614 <provider selected="true" editor-type-id="images">
698 <state /> 615 <state />
699 </provider> 616 </provider>
700 </entry> 617 </entry>
701 - <entry file="file://$PROJECT_DIR$/public/tou.png"> 618 + <entry file="file://$PROJECT_DIR$/public/upload/poster/poster_11_22.png">
  619 + <provider selected="true" editor-type-id="images">
  620 + <state />
  621 + </provider>
  622 + </entry>
  623 + <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_11_22.jpg">
  624 + <provider selected="true" editor-type-id="images">
  625 + <state />
  626 + </provider>
  627 + </entry>
  628 + <entry file="file://$PROJECT_DIR$/public/upload/qrcode/tou.11.jpg">
702 <provider selected="true" editor-type-id="images"> 629 <provider selected="true" editor-type-id="images">
703 <state /> 630 <state />
704 </provider> 631 </provider>
705 </entry> 632 </entry>
706 <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> 633 <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php">
707 <provider selected="true" editor-type-id="text-editor"> 634 <provider selected="true" editor-type-id="text-editor">
708 - <state relative-caret-position="257">  
709 - <caret line="328" column="62" lean-forward="true" selection-start-line="328" selection-start-column="62" selection-end-line="328" selection-end-column="62" /> 635 + <state relative-caret-position="82">
  636 + <caret line="312" column="58" lean-forward="true" selection-start-line="312" selection-start-column="58" selection-end-line="312" selection-end-column="58" />
710 <folding> 637 <folding>
711 <element signature="e#129#158#0#PHP" expanded="true" /> 638 <element signature="e#129#158#0#PHP" expanded="true" />
712 <element signature="e#344#512#0#PHP" expanded="false" /> 639 <element signature="e#344#512#0#PHP" expanded="false" />
@@ -725,11 +652,12 @@ @@ -725,11 +652,12 @@
725 <element signature="e#6020#6946#0#PHP" expanded="false" /> 652 <element signature="e#6020#6946#0#PHP" expanded="false" />
726 <element signature="e#6952#7256#0#PHP" expanded="false" /> 653 <element signature="e#6952#7256#0#PHP" expanded="false" />
727 <element signature="e#7261#7650#0#PHP" expanded="false" /> 654 <element signature="e#7261#7650#0#PHP" expanded="false" />
728 - <element signature="e#10737#11528#0#PHP" expanded="false" />  
729 - <element signature="e#11548#12412#0#PHP" expanded="false" />  
730 - <element signature="e#12439#12839#0#PHP" expanded="false" />  
731 - <element signature="e#12863#13436#0#PHP" expanded="false" />  
732 - <element signature="e#13459#14269#0#PHP" expanded="false" /> 655 + <element signature="e#10378#10806#0#PHP" expanded="false" />
  656 + <element signature="e#10811#11602#0#PHP" expanded="false" />
  657 + <element signature="e#11622#12486#0#PHP" expanded="false" />
  658 + <element signature="e#12513#12913#0#PHP" expanded="false" />
  659 + <element signature="e#12937#13510#0#PHP" expanded="false" />
  660 + <element signature="e#13533#14343#0#PHP" expanded="false" />
733 </folding> 661 </folding>
734 </state> 662 </state>
735 </provider> 663 </provider>
@@ -294,7 +294,6 @@ class OtherController extends RestBaseController @@ -294,7 +294,6 @@ class OtherController extends RestBaseController
294 * 294 *
295 * @param name:job_id type:int require:1 other: desc:信息id 295 * @param name:job_id type:int require:1 other: desc:信息id
296 * @param name:route type:string require:1 other: desc:页面路径与参数 296 * @param name:route type:string require:1 other: desc:页面路径与参数
297 - * @param name:avatar type:string require:1 other: desc:用户头像  
298 * 297 *
299 * @return url:海报地址 298 * @return url:海报地址
300 * 299 *
@@ -324,19 +323,20 @@ class OtherController extends RestBaseController @@ -324,19 +323,20 @@ class OtherController extends RestBaseController
324 ->field('avatar,user_nickname') 323 ->field('avatar,user_nickname')
325 ->where('id',$job['user_id']) 324 ->where('id',$job['user_id'])
326 ->find(); 325 ->find();
327 - $avatar = $this->request->param('avatar'); 326 + $avatarUrl = file_put_contents(ROOT_PATH."public/upload/qrcode/tou.$user_id.jpg",file_get_contents($user['avatar']));
328 $image = \think\Image::open(ROOT_PATH."public/bg.png"); 327 $image = \think\Image::open(ROOT_PATH."public/bg.png");
329 - $tou = \think\Image::open(ROOT_PATH."public/tou.png");  
330 - $tou->thumb(90,90,\think\Image::THUMB_CENTER)->save(ROOT_PATH."public/tou.png"); 328 + $tou = "qrcode/tou.$user_id.jpg";
  329 + $touImage = \think\Image::open(ROOT_PATH."public/upload/$tou");
  330 + $touImage->thumb(90,90,\think\Image::THUMB_CENTER)->save(ROOT_PATH."public/upload/$tou");
331 $text = "期待你的加入"; 331 $text = "期待你的加入";
332 $remark = "长按识别二维码识别小程序"; 332 $remark = "长按识别二维码识别小程序";
333 $result = $image 333 $result = $image
334 - ->water(ROOT_PATH."public/tou.png",[35,48],100) 334 + ->water(ROOT_PATH."public/upload/$tou",[35,48],100)
335 ->water(ROOT_PATH."public/upload/$code",[456,590],100) 335 ->water(ROOT_PATH."public/upload/$code",[456,590],100)
336 ->text($remark,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',16,'#FFFFFF',[66,659]) 336 ->text($remark,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',16,'#FFFFFF',[66,659])
337 - ->text($text,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',14,'#FFFFFF',[132,100]) 337 + ->text($text,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',14,'#FFFFFF',[142,100])
338 ->text($job['job_title'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',22,'#FFFFFF',[100,200]) 338 ->text($job['job_title'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',22,'#FFFFFF',[100,200])
339 - ->text($user['user_nickname'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',16,'#FFFFFF',[132,60]); 339 + ->text($user['user_nickname'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',16,'#FFFFFF',[142,60]);
340 $result->save($savePath."poster_".$user_id."_$job_id.png"); 340 $result->save($savePath."poster_".$user_id."_$job_id.png");
341 $this->success('SUCCESS',['url'=>cmf_get_image_url("poster/poster_".$user_id."_$job_id.png")]); 341 $this->success('SUCCESS',['url'=>cmf_get_image_url("poster/poster_".$user_id."_$job_id.png")]);
342 } 342 }