正在显示
2 个修改的文件
包含
52 行增加
和
30 行删除
@@ -11,13 +11,35 @@ | @@ -11,13 +11,35 @@ | ||
11 | <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> | 11 | <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
12 | <option name="LAST_RESOLUTION" value="IGNORE" /> | 12 | <option name="LAST_RESOLUTION" value="IGNORE" /> |
13 | </component> | 13 | </component> |
14 | + <component name="DockManager"> | ||
15 | + <window id="1"> | ||
16 | + <content type="file-editors"> | ||
17 | + <state> | ||
18 | + <leaf> | ||
19 | + <file leaf-file-name="Image.php" pinned="false" current-in-tab="true"> | ||
20 | + <entry file="file://$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php"> | ||
21 | + <provider selected="true" editor-type-id="text-editor"> | ||
22 | + <state relative-caret-position="1210"> | ||
23 | + <caret line="518" column="5" lean-forward="true" selection-start-line="518" selection-start-column="5" selection-end-line="518" selection-end-column="5" /> | ||
24 | + <folding> | ||
25 | + <element signature="e#616#660#0#PHP" expanded="true" /> | ||
26 | + </folding> | ||
27 | + </state> | ||
28 | + </provider> | ||
29 | + </entry> | ||
30 | + </file> | ||
31 | + </leaf> | ||
32 | + </state> | ||
33 | + </content> | ||
34 | + </window> | ||
35 | + </component> | ||
14 | <component name="FileEditorManager"> | 36 | <component name="FileEditorManager"> |
15 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | 37 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
16 | <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="true"> | 38 | <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="true"> |
17 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | 39 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> |
18 | <provider selected="true" editor-type-id="text-editor"> | 40 | <provider selected="true" editor-type-id="text-editor"> |
19 | - <state relative-caret-position="582"> | ||
20 | - <caret line="335" column="104" lean-forward="false" selection-start-line="335" selection-start-column="104" selection-end-line="335" selection-end-column="104" /> | 41 | + <state relative-caret-position="432"> |
42 | + <caret line="335" column="118" lean-forward="false" selection-start-line="335" selection-start-column="118" selection-end-line="335" selection-end-column="118" /> | ||
21 | <folding> | 43 | <folding> |
22 | <element signature="e#129#158#0#PHP" expanded="true" /> | 44 | <element signature="e#129#158#0#PHP" expanded="true" /> |
23 | <element signature="e#344#512#0#PHP" expanded="false" /> | 45 | <element signature="e#344#512#0#PHP" expanded="false" /> |
@@ -36,12 +58,12 @@ | @@ -36,12 +58,12 @@ | ||
36 | <element signature="e#6020#6946#0#PHP" expanded="false" /> | 58 | <element signature="e#6020#6946#0#PHP" expanded="false" /> |
37 | <element signature="e#6952#7256#0#PHP" expanded="false" /> | 59 | <element signature="e#6952#7256#0#PHP" expanded="false" /> |
38 | <element signature="e#7261#7650#0#PHP" expanded="false" /> | 60 | <element signature="e#7261#7650#0#PHP" expanded="false" /> |
39 | - <element signature="e#10209#10637#0#PHP" expanded="false" /> | ||
40 | - <element signature="e#10642#11433#0#PHP" expanded="false" /> | ||
41 | - <element signature="e#11453#12317#0#PHP" expanded="false" /> | ||
42 | - <element signature="e#12344#12744#0#PHP" expanded="false" /> | ||
43 | - <element signature="e#12768#13341#0#PHP" expanded="false" /> | ||
44 | - <element signature="e#13364#14174#0#PHP" expanded="false" /> | 61 | + <element signature="e#10208#10636#0#PHP" expanded="false" /> |
62 | + <element signature="e#10641#11432#0#PHP" expanded="false" /> | ||
63 | + <element signature="e#11452#12316#0#PHP" expanded="false" /> | ||
64 | + <element signature="e#12343#12743#0#PHP" expanded="false" /> | ||
65 | + <element signature="e#12767#13340#0#PHP" expanded="false" /> | ||
66 | + <element signature="e#13363#14173#0#PHP" expanded="false" /> | ||
45 | </folding> | 67 | </folding> |
46 | </state> | 68 | </state> |
47 | </provider> | 69 | </provider> |
@@ -130,10 +152,10 @@ | @@ -130,10 +152,10 @@ | ||
130 | </component> | 152 | </component> |
131 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 153 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
132 | <component name="ProjectFrameBounds" extendedState="1"> | 154 | <component name="ProjectFrameBounds" extendedState="1"> |
133 | - <option name="x" value="63" /> | ||
134 | - <option name="y" value="139" /> | 155 | + <option name="x" value="-115" /> |
156 | + <option name="y" value="71" /> | ||
135 | <option name="width" value="1868" /> | 157 | <option name="width" value="1868" /> |
136 | - <option name="height" value="1019" /> | 158 | + <option name="height" value="1056" /> |
137 | </component> | 159 | </component> |
138 | <component name="ProjectView"> | 160 | <component name="ProjectView"> |
139 | <navigator currentView="ProjectPane" proportions="" version="1"> | 161 | <navigator currentView="ProjectPane" proportions="" version="1"> |
@@ -245,15 +267,15 @@ | @@ -245,15 +267,15 @@ | ||
245 | <workItem from="1569544728303" duration="25104000" /> | 267 | <workItem from="1569544728303" duration="25104000" /> |
246 | <workItem from="1569716359574" duration="28303000" /> | 268 | <workItem from="1569716359574" duration="28303000" /> |
247 | <workItem from="1569751435531" duration="3201000" /> | 269 | <workItem from="1569751435531" duration="3201000" /> |
248 | - <workItem from="1569803523139" duration="5126000" /> | 270 | + <workItem from="1569803523139" duration="5731000" /> |
249 | </task> | 271 | </task> |
250 | <servers /> | 272 | <servers /> |
251 | </component> | 273 | </component> |
252 | <component name="TimeTrackingManager"> | 274 | <component name="TimeTrackingManager"> |
253 | - <option name="totallyTimeSpent" value="435621000" /> | 275 | + <option name="totallyTimeSpent" value="436226000" /> |
254 | </component> | 276 | </component> |
255 | <component name="ToolWindowManager"> | 277 | <component name="ToolWindowManager"> |
256 | - <frame x="63" y="139" width="1868" height="1019" extended-state="1" /> | 278 | + <frame x="-115" y="71" width="1868" height="1056" extended-state="1" /> |
257 | <editor active="true" /> | 279 | <editor active="true" /> |
258 | <layout> | 280 | <layout> |
259 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18473451" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | 281 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18473451" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> |
@@ -595,25 +617,25 @@ | @@ -595,25 +617,25 @@ | ||
595 | </state> | 617 | </state> |
596 | </provider> | 618 | </provider> |
597 | </entry> | 619 | </entry> |
620 | + <entry file="file://$PROJECT_DIR$/public/bg.png"> | ||
621 | + <provider selected="true" editor-type-id="images"> | ||
622 | + <state /> | ||
623 | + </provider> | ||
624 | + </entry> | ||
598 | <entry file="file://$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php"> | 625 | <entry file="file://$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php"> |
599 | <provider selected="true" editor-type-id="text-editor"> | 626 | <provider selected="true" editor-type-id="text-editor"> |
600 | - <state relative-caret-position="407"> | ||
601 | - <caret line="599" column="5" lean-forward="true" selection-start-line="599" selection-start-column="5" selection-end-line="599" selection-end-column="5" /> | 627 | + <state relative-caret-position="1210"> |
628 | + <caret line="518" column="5" lean-forward="true" selection-start-line="518" selection-start-column="5" selection-end-line="518" selection-end-column="5" /> | ||
602 | <folding> | 629 | <folding> |
603 | <element signature="e#616#660#0#PHP" expanded="true" /> | 630 | <element signature="e#616#660#0#PHP" expanded="true" /> |
604 | </folding> | 631 | </folding> |
605 | </state> | 632 | </state> |
606 | </provider> | 633 | </provider> |
607 | </entry> | 634 | </entry> |
608 | - <entry file="file://$PROJECT_DIR$/public/bg.png"> | ||
609 | - <provider selected="true" editor-type-id="images"> | ||
610 | - <state /> | ||
611 | - </provider> | ||
612 | - </entry> | ||
613 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | 635 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> |
614 | <provider selected="true" editor-type-id="text-editor"> | 636 | <provider selected="true" editor-type-id="text-editor"> |
615 | - <state relative-caret-position="582"> | ||
616 | - <caret line="335" column="104" lean-forward="false" selection-start-line="335" selection-start-column="104" selection-end-line="335" selection-end-column="104" /> | 637 | + <state relative-caret-position="432"> |
638 | + <caret line="335" column="118" lean-forward="false" selection-start-line="335" selection-start-column="118" selection-end-line="335" selection-end-column="118" /> | ||
617 | <folding> | 639 | <folding> |
618 | <element signature="e#129#158#0#PHP" expanded="true" /> | 640 | <element signature="e#129#158#0#PHP" expanded="true" /> |
619 | <element signature="e#344#512#0#PHP" expanded="false" /> | 641 | <element signature="e#344#512#0#PHP" expanded="false" /> |
@@ -632,12 +654,12 @@ | @@ -632,12 +654,12 @@ | ||
632 | <element signature="e#6020#6946#0#PHP" expanded="false" /> | 654 | <element signature="e#6020#6946#0#PHP" expanded="false" /> |
633 | <element signature="e#6952#7256#0#PHP" expanded="false" /> | 655 | <element signature="e#6952#7256#0#PHP" expanded="false" /> |
634 | <element signature="e#7261#7650#0#PHP" expanded="false" /> | 656 | <element signature="e#7261#7650#0#PHP" expanded="false" /> |
635 | - <element signature="e#10209#10637#0#PHP" expanded="false" /> | ||
636 | - <element signature="e#10642#11433#0#PHP" expanded="false" /> | ||
637 | - <element signature="e#11453#12317#0#PHP" expanded="false" /> | ||
638 | - <element signature="e#12344#12744#0#PHP" expanded="false" /> | ||
639 | - <element signature="e#12768#13341#0#PHP" expanded="false" /> | ||
640 | - <element signature="e#13364#14174#0#PHP" expanded="false" /> | 657 | + <element signature="e#10208#10636#0#PHP" expanded="false" /> |
658 | + <element signature="e#10641#11432#0#PHP" expanded="false" /> | ||
659 | + <element signature="e#11452#12316#0#PHP" expanded="false" /> | ||
660 | + <element signature="e#12343#12743#0#PHP" expanded="false" /> | ||
661 | + <element signature="e#12767#13340#0#PHP" expanded="false" /> | ||
662 | + <element signature="e#13363#14173#0#PHP" expanded="false" /> | ||
641 | </folding> | 663 | </folding> |
642 | </state> | 664 | </state> |
643 | </provider> | 665 | </provider> |
@@ -333,7 +333,7 @@ class OtherController extends RestBaseController | @@ -333,7 +333,7 @@ class OtherController extends RestBaseController | ||
333 | ->water(ROOT_PATH."public/upload/$tou",[35,48],100) | 333 | ->water(ROOT_PATH."public/upload/$tou",[35,48],100) |
334 | ->water(ROOT_PATH."public/upload/$code",[212,700],100) | 334 | ->water(ROOT_PATH."public/upload/$code",[212,700],100) |
335 | ->text($text,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',14,'#FFFFFF',[142,100]) | 335 | ->text($text,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',14,'#FFFFFF',[142,100]) |
336 | - ->text($job['job_title'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',25,'#FFFFFF',[100,200]) | 336 | + ->text($job['job_title'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',25,'#FFFFFF',[55,200]) |
337 | ->text($user['user_nickname'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',16,'#FFFFFF',[142,60]); | 337 | ->text($user['user_nickname'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',16,'#FFFFFF',[142,60]); |
338 | $result->save($savePath."poster_".$user_id."_$job_id.png"); | 338 | $result->save($savePath."poster_".$user_id."_$job_id.png"); |
339 | $this->success('SUCCESS',['url'=>cmf_get_image_url("poster/poster_".$user_id."_$job_id.png")]); | 339 | $this->success('SUCCESS',['url'=>cmf_get_image_url("poster/poster_".$user_id."_$job_id.png")]); |
-
请 注册 或 登录 后发表评论