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

用户头像

@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
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="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
5 <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" />
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ReleaseController.php" afterPath="$PROJECT_DIR$/api/index/controller/ReleaseController.php" />  
7 </list> 7 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -14,11 +14,11 @@ @@ -14,11 +14,11 @@
14 </component> 14 </component>
15 <component name="FileEditorManager"> 15 <component name="FileEditorManager">
16 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 16 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
17 - <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="false"> 17 + <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="true">
18 <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> 18 <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php">
19 <provider selected="true" editor-type-id="text-editor"> 19 <provider selected="true" editor-type-id="text-editor">
20 - <state relative-caret-position="299">  
21 - <caret line="325" column="0" lean-forward="false" selection-start-line="325" selection-start-column="0" selection-end-line="325" selection-end-column="0" /> 20 + <state relative-caret-position="459">
  21 + <caret line="327" column="22" lean-forward="false" selection-start-line="327" selection-start-column="22" selection-end-line="327" selection-end-column="22" />
22 <folding> 22 <folding>
23 <element signature="e#129#158#0#PHP" expanded="true" /> 23 <element signature="e#129#158#0#PHP" expanded="true" />
24 <element signature="e#344#512#0#PHP" expanded="false" /> 24 <element signature="e#344#512#0#PHP" expanded="false" />
@@ -37,26 +37,17 @@ @@ -37,26 +37,17 @@
37 <element signature="e#6020#6946#0#PHP" expanded="false" /> 37 <element signature="e#6020#6946#0#PHP" expanded="false" />
38 <element signature="e#6952#7256#0#PHP" expanded="false" /> 38 <element signature="e#6952#7256#0#PHP" expanded="false" />
39 <element signature="e#7261#7650#0#PHP" expanded="false" /> 39 <element signature="e#7261#7650#0#PHP" expanded="false" />
40 - <element signature="e#7656#8029#0#PHP" expanded="false" />  
41 - <element signature="e#11221#12085#0#PHP" expanded="false" />  
42 - <element signature="e#12112#12512#0#PHP" expanded="false" />  
43 - <element signature="e#12535#13108#0#PHP" expanded="false" />  
44 - <element signature="e#13114#14167#0#PHP" expanded="false" /> 40 + <element signature="e#10591#11382#0#PHP" expanded="false" />
  41 + <element signature="e#11402#12266#0#PHP" expanded="false" />
  42 + <element signature="e#12293#12693#0#PHP" expanded="false" />
  43 + <element signature="e#12717#13290#0#PHP" expanded="false" />
  44 + <element signature="e#13313#14123#0#PHP" expanded="false" />
  45 + <element signature="e#14130#15183#0#PHP" expanded="false" />
45 </folding> 46 </folding>
46 </state> 47 </state>
47 </provider> 48 </provider>
48 </entry> 49 </entry>
49 </file> 50 </file>
50 - <file leaf-file-name="ReleaseController.php" pinned="false" current-in-tab="true">  
51 - <entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php">  
52 - <provider selected="true" editor-type-id="text-editor">  
53 - <state relative-caret-position="275">  
54 - <caret line="219" column="16" lean-forward="true" selection-start-line="219" selection-start-column="16" selection-end-line="219" selection-end-column="16" />  
55 - <folding />  
56 - </state>  
57 - </provider>  
58 - </entry>  
59 - </file>  
60 </leaf> 51 </leaf>
61 </component> 52 </component>
62 <component name="FileTemplateManagerImpl"> 53 <component name="FileTemplateManagerImpl">
@@ -116,9 +107,9 @@ @@ -116,9 +107,9 @@
116 <option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" /> 107 <option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" />
117 <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" /> 108 <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
118 <option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> 109 <option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" />
119 - <option value="$PROJECT_DIR$/api/index/controller/OtherController.php" />  
120 <option value="$PROJECT_DIR$/api/index/controller/SendController.php" /> 110 <option value="$PROJECT_DIR$/api/index/controller/SendController.php" />
121 <option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" /> 111 <option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" />
  112 + <option value="$PROJECT_DIR$/api/index/controller/OtherController.php" />
122 </list> 113 </list>
123 </option> 114 </option>
124 </component> 115 </component>
@@ -137,10 +128,10 @@ @@ -137,10 +128,10 @@
137 </component> 128 </component>
138 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 129 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
139 <component name="ProjectFrameBounds" extendedState="1"> 130 <component name="ProjectFrameBounds" extendedState="1">
140 - <option name="x" value="99" />  
141 - <option name="y" value="108" /> 131 + <option name="x" value="-108" />
  132 + <option name="y" value="43" />
142 <option name="width" value="1868" /> 133 <option name="width" value="1868" />
143 - <option name="height" value="1061" /> 134 + <option name="height" value="1046" />
144 </component> 135 </component>
145 <component name="ProjectView"> 136 <component name="ProjectView">
146 <navigator currentView="ProjectPane" proportions="" version="1"> 137 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -169,24 +160,6 @@ @@ -169,24 +160,6 @@
169 <path> 160 <path>
170 <item name="resource" type="b2602c69:ProjectViewProjectNode" /> 161 <item name="resource" type="b2602c69:ProjectViewProjectNode" />
171 <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> 162 <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
172 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
173 - </path>  
174 - <path>  
175 - <item name="resource" type="b2602c69:ProjectViewProjectNode" />  
176 - <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />  
177 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
178 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />  
179 - </path>  
180 - <path>  
181 - <item name="resource" type="b2602c69:ProjectViewProjectNode" />  
182 - <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />  
183 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
184 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />  
185 - <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />  
186 - </path>  
187 - <path>  
188 - <item name="resource" type="b2602c69:ProjectViewProjectNode" />  
189 - <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />  
190 <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> 163 <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
191 </path> 164 </path>
192 <path> 165 <path>
@@ -202,12 +175,6 @@ @@ -202,12 +175,6 @@
202 <item name="upload" type="2a2b976b:PhpTreeStructureProvider$1" /> 175 <item name="upload" type="2a2b976b:PhpTreeStructureProvider$1" />
203 <item name="qrcode" type="2a2b976b:PhpTreeStructureProvider$1" /> 176 <item name="qrcode" type="2a2b976b:PhpTreeStructureProvider$1" />
204 </path> 177 </path>
205 - <path>  
206 - <item name="resource" type="b2602c69:ProjectViewProjectNode" />  
207 - <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />  
208 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
209 - <item name="uploads" type="2a2b976b:PhpTreeStructureProvider$1" />  
210 - </path>  
211 </expand> 178 </expand>
212 <select /> 179 <select />
213 </subPane> 180 </subPane>
@@ -287,15 +254,15 @@ @@ -287,15 +254,15 @@
287 <workItem from="1569486627319" duration="2740000" /> 254 <workItem from="1569486627319" duration="2740000" />
288 <workItem from="1569494185536" duration="1054000" /> 255 <workItem from="1569494185536" duration="1054000" />
289 <workItem from="1569544728303" duration="25104000" /> 256 <workItem from="1569544728303" duration="25104000" />
290 - <workItem from="1569716359574" duration="19845000" /> 257 + <workItem from="1569716359574" duration="26396000" />
291 </task> 258 </task>
292 <servers /> 259 <servers />
293 </component> 260 </component>
294 <component name="TimeTrackingManager"> 261 <component name="TimeTrackingManager">
295 - <option name="totallyTimeSpent" value="418836000" /> 262 + <option name="totallyTimeSpent" value="425387000" />
296 </component> 263 </component>
297 <component name="ToolWindowManager"> 264 <component name="ToolWindowManager">
298 - <frame x="99" y="108" width="1868" height="1061" extended-state="1" /> 265 + <frame x="-108" y="43" width="1868" height="1046" extended-state="1" />
299 <editor active="true" /> 266 <editor active="true" />
300 <layout> 267 <layout>
301 <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" /> 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" />
@@ -325,33 +292,11 @@ @@ -325,33 +292,11 @@
325 </component> 292 </component>
326 <component name="XDebuggerManager"> 293 <component name="XDebuggerManager">
327 <breakpoint-manager> 294 <breakpoint-manager>
328 - <option name="time" value="7" /> 295 + <option name="time" value="8" />
329 </breakpoint-manager> 296 </breakpoint-manager>
330 <watches-manager /> 297 <watches-manager />
331 </component> 298 </component>
332 <component name="editorHistoryManager"> 299 <component name="editorHistoryManager">
333 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/attestation/edit.html">  
334 - <provider selected="true" editor-type-id="text-editor">  
335 - <state relative-caret-position="200">  
336 - <caret line="29" column="25" lean-forward="true" selection-start-line="29" selection-start-column="25" selection-end-line="29" selection-end-column="25" />  
337 - </state>  
338 - </provider>  
339 - </entry>  
340 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/approve.html">  
341 - <provider selected="true" editor-type-id="text-editor">  
342 - <state relative-caret-position="100">  
343 - <caret line="4" column="29" lean-forward="false" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />  
344 - </state>  
345 - </provider>  
346 - </entry>  
347 - <entry file="file://$PROJECT_DIR$/app/user/controller/AdminIndexController.php">  
348 - <provider selected="true" editor-type-id="text-editor">  
349 - <state relative-caret-position="25">  
350 - <caret line="183" column="21" lean-forward="false" selection-start-line="183" selection-start-column="21" selection-end-line="183" selection-end-column="21" />  
351 - </state>  
352 - </provider>  
353 - </entry>  
354 - <entry file="file://$PROJECT_DIR$/app/admin/controller/MessageController.php" />  
355 <entry file="file://$PROJECT_DIR$/api/index/controller/CommonController.php" /> 300 <entry file="file://$PROJECT_DIR$/api/index/controller/CommonController.php" />
356 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html"> 301 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html">
357 <provider selected="true" editor-type-id="text-editor"> 302 <provider selected="true" editor-type-id="text-editor">
@@ -500,13 +445,6 @@ @@ -500,13 +445,6 @@
500 </state> 445 </state>
501 </provider> 446 </provider>
502 </entry> 447 </entry>
503 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ActiveController.php">  
504 - <provider selected="true" editor-type-id="text-editor">  
505 - <state relative-caret-position="325">  
506 - <caret line="105" column="14" lean-forward="true" selection-start-line="105" selection-start-column="14" selection-end-line="105" selection-end-column="14" />  
507 - </state>  
508 - </provider>  
509 - </entry>  
510 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/area.html"> 448 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/area.html">
511 <provider selected="true" editor-type-id="text-editor"> 449 <provider selected="true" editor-type-id="text-editor">
512 <state relative-caret-position="239"> 450 <state relative-caret-position="239">
@@ -543,31 +481,6 @@ @@ -543,31 +481,6 @@
543 </state> 481 </state>
544 </provider> 482 </provider>
545 </entry> 483 </entry>
546 - <entry file="file://$PROJECT_DIR$/api/index/controller/ActiveController.php">  
547 - <provider selected="true" editor-type-id="text-editor">  
548 - <state relative-caret-position="175">  
549 - <caret line="602" column="4" lean-forward="false" selection-start-line="602" selection-start-column="4" selection-end-line="614" selection-end-column="5" />  
550 - <folding>  
551 - <element signature="e#330#916#0#PHP" expanded="false" />  
552 - <element signature="e#921#1852#0#PHP" expanded="false" />  
553 - <element signature="e#1858#2458#0#PHP" expanded="false" />  
554 - <element signature="e#2463#4046#0#PHP" expanded="false" />  
555 - <element signature="e#4052#5044#0#PHP" expanded="false" />  
556 - <element signature="e#5049#6284#0#PHP" expanded="false" />  
557 - <element signature="e#6290#6899#0#PHP" expanded="false" />  
558 - <element signature="e#6904#8090#0#PHP" expanded="false" />  
559 - <element signature="e#8096#8619#0#PHP" expanded="false" />  
560 - <element signature="e#8624#9157#0#PHP" expanded="false" />  
561 - <element signature="e#9163#9683#0#PHP" expanded="false" />  
562 - <element signature="e#9688#10261#0#PHP" expanded="false" />  
563 - <element signature="e#10267#10534#0#PHP" expanded="false" />  
564 - <element signature="e#10539#15152#0#PHP" expanded="false" />  
565 - <element signature="e#15158#15422#0#PHP" expanded="false" />  
566 - <element signature="e#15427#20222#0#PHP" expanded="false" />  
567 - </folding>  
568 - </state>  
569 - </provider>  
570 - </entry>  
571 <entry file="file://$PROJECT_DIR$/public/upload/portal/20190831/d8585d9b898179f2871f8bd4c760c0ec.png"> 484 <entry file="file://$PROJECT_DIR$/public/upload/portal/20190831/d8585d9b898179f2871f8bd4c760c0ec.png">
572 <provider selected="true" editor-type-id="images"> 485 <provider selected="true" editor-type-id="images">
573 <state /> 486 <state />
@@ -600,11 +513,6 @@ @@ -600,11 +513,6 @@
600 </state> 513 </state>
601 </provider> 514 </provider>
602 </entry> 515 </entry>
603 - <entry file="file://$PROJECT_DIR$/public/upload/poster/poster_11_22.png">  
604 - <provider selected="true" editor-type-id="images">  
605 - <state />  
606 - </provider>  
607 - </entry>  
608 <entry file="file://$PROJECT_DIR$/public/index.php"> 516 <entry file="file://$PROJECT_DIR$/public/index.php">
609 <provider selected="true" editor-type-id="text-editor"> 517 <provider selected="true" editor-type-id="text-editor">
610 <state relative-caret-position="0"> 518 <state relative-caret-position="0">
@@ -655,26 +563,11 @@ @@ -655,26 +563,11 @@
655 </state> 563 </state>
656 </provider> 564 </provider>
657 </entry> 565 </entry>
658 - <entry file="file://$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php">  
659 - <provider selected="true" editor-type-id="text-editor">  
660 - <state relative-caret-position="125">  
661 - <caret line="13" column="4" lean-forward="true" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />  
662 - <folding>  
663 - <element signature="e#616#660#0#PHP" expanded="true" />  
664 - </folding>  
665 - </state>  
666 - </provider>  
667 - </entry>  
668 <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_14_22.jpg"> 566 <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_14_22.jpg">
669 <provider selected="true" editor-type-id="images"> 567 <provider selected="true" editor-type-id="images">
670 <state /> 568 <state />
671 </provider> 569 </provider>
672 </entry> 570 </entry>
673 - <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_11_22.jpg">  
674 - <provider selected="true" editor-type-id="images">  
675 - <state />  
676 - </provider>  
677 - </entry>  
678 <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> 571 <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php">
679 <provider selected="true" editor-type-id="text-editor"> 572 <provider selected="true" editor-type-id="text-editor">
680 <state relative-caret-position="349"> 573 <state relative-caret-position="349">
@@ -716,10 +609,100 @@ @@ -716,10 +609,100 @@
716 </state> 609 </state>
717 </provider> 610 </provider>
718 </entry> 611 </entry>
  612 + <entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php">
  613 + <provider selected="true" editor-type-id="text-editor">
  614 + <state relative-caret-position="275">
  615 + <caret line="219" column="16" lean-forward="true" selection-start-line="219" selection-start-column="16" selection-end-line="219" selection-end-column="16" />
  616 + <folding />
  617 + </state>
  618 + </provider>
  619 + </entry>
  620 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/lib/Storage.php">
  621 + <provider selected="true" editor-type-id="text-editor">
  622 + <state relative-caret-position="499">
  623 + <caret line="123" column="20" lean-forward="true" selection-start-line="123" selection-start-column="20" selection-end-line="123" selection-end-column="20" />
  624 + <folding />
  625 + </state>
  626 + </provider>
  627 + </entry>
  628 + <entry file="file://$PROJECT_DIR$/public/upload/poster/poster_11_22.png">
  629 + <provider selected="true" editor-type-id="images">
  630 + <state />
  631 + </provider>
  632 + </entry>
  633 + <entry file="file://$PROJECT_DIR$/public/upload/poster/poster_14_22.png">
  634 + <provider selected="true" editor-type-id="images">
  635 + <state />
  636 + </provider>
  637 + </entry>
  638 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
  639 + <provider selected="true" editor-type-id="text-editor">
  640 + <state relative-caret-position="10231">
  641 + <caret line="706" column="34" lean-forward="false" selection-start-line="706" selection-start-column="34" selection-end-line="706" selection-end-column="34" />
  642 + <folding />
  643 + </state>
  644 + </provider>
  645 + </entry>
  646 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ActiveController.php">
  647 + <provider selected="true" editor-type-id="text-editor">
  648 + <state relative-caret-position="1300">
  649 + <caret line="69" column="13" lean-forward="true" selection-start-line="69" selection-start-column="13" selection-end-line="69" selection-end-column="13" />
  650 + <folding />
  651 + </state>
  652 + </provider>
  653 + </entry>
  654 + <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/http/http.php">
  655 + <provider selected="true" editor-type-id="text-editor">
  656 + <state relative-caret-position="294">
  657 + <caret line="2549" column="9" lean-forward="false" selection-start-line="2549" selection-start-column="9" selection-end-line="2549" selection-end-column="9" />
  658 + <folding />
  659 + </state>
  660 + </provider>
  661 + </entry>
  662 + <entry file="file://$PROJECT_DIR$/api/index/controller/ActiveController.php">
  663 + <provider selected="true" editor-type-id="text-editor">
  664 + <state relative-caret-position="684">
  665 + <caret line="633" column="0" lean-forward="true" selection-start-line="633" selection-start-column="0" selection-end-line="633" selection-end-column="0" />
  666 + <folding>
  667 + <element signature="e#330#916#0#PHP" expanded="false" />
  668 + <element signature="e#921#1852#0#PHP" expanded="false" />
  669 + <element signature="e#1858#2458#0#PHP" expanded="false" />
  670 + <element signature="e#2463#4046#0#PHP" expanded="false" />
  671 + <element signature="e#4052#5044#0#PHP" expanded="false" />
  672 + <element signature="e#5049#6284#0#PHP" expanded="false" />
  673 + <element signature="e#6290#6899#0#PHP" expanded="false" />
  674 + <element signature="e#6904#8090#0#PHP" expanded="false" />
  675 + <element signature="e#8096#8619#0#PHP" expanded="false" />
  676 + <element signature="e#8624#9157#0#PHP" expanded="false" />
  677 + <element signature="e#9163#9683#0#PHP" expanded="false" />
  678 + <element signature="e#9688#10261#0#PHP" expanded="false" />
  679 + <element signature="e#10267#10534#0#PHP" expanded="false" />
  680 + <element signature="e#10539#15152#0#PHP" expanded="false" />
  681 + <element signature="e#15158#15422#0#PHP" expanded="false" />
  682 + <element signature="e#15427#20222#0#PHP" expanded="false" />
  683 + </folding>
  684 + </state>
  685 + </provider>
  686 + </entry>
  687 + <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_11_22.jpg">
  688 + <provider selected="true" editor-type-id="images">
  689 + <state />
  690 + </provider>
  691 + </entry>
  692 + <entry file="file://$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php">
  693 + <provider selected="true" editor-type-id="text-editor">
  694 + <state relative-caret-position="684">
  695 + <caret line="384" column="20" lean-forward="false" selection-start-line="384" selection-start-column="20" selection-end-line="384" selection-end-column="20" />
  696 + <folding>
  697 + <element signature="e#616#660#0#PHP" expanded="true" />
  698 + </folding>
  699 + </state>
  700 + </provider>
  701 + </entry>
719 <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> 702 <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php">
720 <provider selected="true" editor-type-id="text-editor"> 703 <provider selected="true" editor-type-id="text-editor">
721 - <state relative-caret-position="299">  
722 - <caret line="325" column="0" lean-forward="false" selection-start-line="325" selection-start-column="0" selection-end-line="325" selection-end-column="0" /> 704 + <state relative-caret-position="459">
  705 + <caret line="327" column="22" lean-forward="false" selection-start-line="327" selection-start-column="22" selection-end-line="327" selection-end-column="22" />
723 <folding> 706 <folding>
724 <element signature="e#129#158#0#PHP" expanded="true" /> 707 <element signature="e#129#158#0#PHP" expanded="true" />
725 <element signature="e#344#512#0#PHP" expanded="false" /> 708 <element signature="e#344#512#0#PHP" expanded="false" />
@@ -738,22 +721,15 @@ @@ -738,22 +721,15 @@
738 <element signature="e#6020#6946#0#PHP" expanded="false" /> 721 <element signature="e#6020#6946#0#PHP" expanded="false" />
739 <element signature="e#6952#7256#0#PHP" expanded="false" /> 722 <element signature="e#6952#7256#0#PHP" expanded="false" />
740 <element signature="e#7261#7650#0#PHP" expanded="false" /> 723 <element signature="e#7261#7650#0#PHP" expanded="false" />
741 - <element signature="e#7656#8029#0#PHP" expanded="false" />  
742 - <element signature="e#11221#12085#0#PHP" expanded="false" />  
743 - <element signature="e#12112#12512#0#PHP" expanded="false" />  
744 - <element signature="e#12535#13108#0#PHP" expanded="false" />  
745 - <element signature="e#13114#14167#0#PHP" expanded="false" /> 724 + <element signature="e#10591#11382#0#PHP" expanded="false" />
  725 + <element signature="e#11402#12266#0#PHP" expanded="false" />
  726 + <element signature="e#12293#12693#0#PHP" expanded="false" />
  727 + <element signature="e#12717#13290#0#PHP" expanded="false" />
  728 + <element signature="e#13313#14123#0#PHP" expanded="false" />
  729 + <element signature="e#14130#15183#0#PHP" expanded="false" />
746 </folding> 730 </folding>
747 </state> 731 </state>
748 </provider> 732 </provider>
749 </entry> 733 </entry>
750 - <entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php">  
751 - <provider selected="true" editor-type-id="text-editor">  
752 - <state relative-caret-position="275">  
753 - <caret line="219" column="16" lean-forward="true" selection-start-line="219" selection-start-column="16" selection-end-line="219" selection-end-column="16" />  
754 - <folding />  
755 - </state>  
756 - </provider>  
757 - </entry>  
758 </component> 734 </component>
759 </project> 735 </project>
@@ -294,6 +294,7 @@ class OtherController extends RestBaseController @@ -294,6 +294,7 @@ 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:用户头像
297 * 298 *
298 * @return url:海报地址 299 * @return url:海报地址
299 * 300 *
@@ -323,12 +324,14 @@ class OtherController extends RestBaseController @@ -323,12 +324,14 @@ class OtherController extends RestBaseController
323 ->field('avatar,user_nickname') 324 ->field('avatar,user_nickname')
324 ->where('id',$job['user_id']) 325 ->where('id',$job['user_id'])
325 ->find(); 326 ->find();
326 - 327 + $avatar = $this->request->param('avatar');
  328 + dump($avatar);
327 $image = \think\Image::open(ROOT_PATH."public/bg.png"); 329 $image = \think\Image::open(ROOT_PATH."public/bg.png");
328 $text = "期待你的加入"; 330 $text = "期待你的加入";
329 $remark = "长按识别二维码识别小程序"; 331 $remark = "长按识别二维码识别小程序";
330 $result = $image 332 $result = $image
331 ->water(ROOT_PATH."public/upload/$code",[456,590],100) 333 ->water(ROOT_PATH."public/upload/$code",[456,590],100)
  334 + ->water($user['avatar'],1,100)
332 ->text($remark,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',14,'#FFFFFF',[66,659]) 335 ->text($remark,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',14,'#FFFFFF',[66,659])
333 ->text($text,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',12,'#FFFFFF',[132,100]) 336 ->text($text,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',12,'#FFFFFF',[132,100])
334 ->text($job['job_title'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',20,'#FFFFFF',[100,200]) 337 ->text($job['job_title'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',20,'#FFFFFF',[100,200])
@@ -407,6 +410,7 @@ class OtherController extends RestBaseController @@ -407,6 +410,7 @@ class OtherController extends RestBaseController
407 $token = $json_arr['access_token']; 410 $token = $json_arr['access_token'];
408 return $token; 411 return $token;
409 } 412 }
  413 +
410 //curl get请求 414 //curl get请求
411 public function http_get($url){ 415 public function http_get($url){
412 $curl = curl_init();//启动一个CURL会话 416 $curl = curl_init();//启动一个CURL会话
@@ -420,6 +424,23 @@ class OtherController extends RestBaseController @@ -420,6 +424,23 @@ class OtherController extends RestBaseController
420 curl_close($curl); 424 curl_close($curl);
421 return $result; 425 return $result;
422 } 426 }
  427 + //curl post请求
  428 + public function http_post($url,$data){
  429 + $curl = curl_init();//启动一个CURL会话
  430 + curl_setopt($curl, CURLOPT_URL, $url); // 要访问的地址
  431 + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); // 对认证证书来源的检查
  432 + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); // 从证书中检查SSL加密算法是否存在
  433 + curl_setopt($curl, CURLOPT_POST, true); // 发送一个常规的Post请求
  434 + curl_setopt($curl, CURLOPT_POSTFIELDS, http_build_query($data)); // Post提交的数据包
  435 + curl_setopt($curl, CURLOPT_TIMEOUT, 30); // 设置超时限制防止死循环
  436 + curl_setopt($curl, CURLOPT_HEADER, false); // 开启header
  437 + //curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);//请求头部
  438 + curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); // 获取的信息以文件流的形式返回
  439 + $result = curl_exec($curl); //执行操作
  440 + curl_close($curl);
  441 + return $result;
  442 + }
  443 +
423 444
424 public function yuanjiao($imgpath){ 445 public function yuanjiao($imgpath){
425 $ext= pathinfo($imgpath); 446 $ext= pathinfo($imgpath);