From dd4f0f6bd6fda070ef3c5daffb7d67eb14414d3c Mon Sep 17 00:00:00 2001 From: guosheng <gs@bronet.cn> Date: Mon, 30 Sep 2019 10:10:41 +0800 Subject: [PATCH] 海报 --- .idea/workspace.xml | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------- api/index/controller/OtherController.php | 2 +- 2 files changed, 52 insertions(+), 30 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 376b053..a7a2c18 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,13 +11,35 @@ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="LAST_RESOLUTION" value="IGNORE" /> </component> + <component name="DockManager"> + <window id="1"> + <content type="file-editors"> + <state> + <leaf> + <file leaf-file-name="Image.php" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1210"> + <caret line="518" column="5" lean-forward="true" selection-start-line="518" selection-start-column="5" selection-end-line="518" selection-end-column="5" /> + <folding> + <element signature="e#616#660#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + </leaf> + </state> + </content> + </window> + </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="582"> - <caret line="335" column="104" lean-forward="false" selection-start-line="335" selection-start-column="104" selection-end-line="335" selection-end-column="104" /> + <state relative-caret-position="432"> + <caret line="335" column="118" lean-forward="false" selection-start-line="335" selection-start-column="118" selection-end-line="335" selection-end-column="118" /> <folding> <element signature="e#129#158#0#PHP" expanded="true" /> <element signature="e#344#512#0#PHP" expanded="false" /> @@ -36,12 +58,12 @@ <element signature="e#6020#6946#0#PHP" expanded="false" /> <element signature="e#6952#7256#0#PHP" expanded="false" /> <element signature="e#7261#7650#0#PHP" expanded="false" /> - <element signature="e#10209#10637#0#PHP" expanded="false" /> - <element signature="e#10642#11433#0#PHP" expanded="false" /> - <element signature="e#11453#12317#0#PHP" expanded="false" /> - <element signature="e#12344#12744#0#PHP" expanded="false" /> - <element signature="e#12768#13341#0#PHP" expanded="false" /> - <element signature="e#13364#14174#0#PHP" expanded="false" /> + <element signature="e#10208#10636#0#PHP" expanded="false" /> + <element signature="e#10641#11432#0#PHP" expanded="false" /> + <element signature="e#11452#12316#0#PHP" expanded="false" /> + <element signature="e#12343#12743#0#PHP" expanded="false" /> + <element signature="e#12767#13340#0#PHP" expanded="false" /> + <element signature="e#13363#14173#0#PHP" expanded="false" /> </folding> </state> </provider> @@ -130,10 +152,10 @@ </component> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> <component name="ProjectFrameBounds" extendedState="1"> - <option name="x" value="63" /> - <option name="y" value="139" /> + <option name="x" value="-115" /> + <option name="y" value="71" /> <option name="width" value="1868" /> - <option name="height" value="1019" /> + <option name="height" value="1056" /> </component> <component name="ProjectView"> <navigator currentView="ProjectPane" proportions="" version="1"> @@ -245,15 +267,15 @@ <workItem from="1569544728303" duration="25104000" /> <workItem from="1569716359574" duration="28303000" /> <workItem from="1569751435531" duration="3201000" /> - <workItem from="1569803523139" duration="5126000" /> + <workItem from="1569803523139" duration="5731000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="435621000" /> + <option name="totallyTimeSpent" value="436226000" /> </component> <component name="ToolWindowManager"> - <frame x="63" y="139" width="1868" height="1019" extended-state="1" /> + <frame x="-115" y="71" width="1868" height="1056" extended-state="1" /> <editor active="true" /> <layout> <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 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/public/bg.png"> + <provider selected="true" editor-type-id="images"> + <state /> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="407"> - <caret line="599" column="5" lean-forward="true" selection-start-line="599" selection-start-column="5" selection-end-line="599" selection-end-column="5" /> + <state relative-caret-position="1210"> + <caret line="518" column="5" lean-forward="true" selection-start-line="518" selection-start-column="5" selection-end-line="518" selection-end-column="5" /> <folding> <element signature="e#616#660#0#PHP" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/public/bg.png"> - <provider selected="true" editor-type-id="images"> - <state /> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="582"> - <caret line="335" column="104" lean-forward="false" selection-start-line="335" selection-start-column="104" selection-end-line="335" selection-end-column="104" /> + <state relative-caret-position="432"> + <caret line="335" column="118" lean-forward="false" selection-start-line="335" selection-start-column="118" selection-end-line="335" selection-end-column="118" /> <folding> <element signature="e#129#158#0#PHP" expanded="true" /> <element signature="e#344#512#0#PHP" expanded="false" /> @@ -632,12 +654,12 @@ <element signature="e#6020#6946#0#PHP" expanded="false" /> <element signature="e#6952#7256#0#PHP" expanded="false" /> <element signature="e#7261#7650#0#PHP" expanded="false" /> - <element signature="e#10209#10637#0#PHP" expanded="false" /> - <element signature="e#10642#11433#0#PHP" expanded="false" /> - <element signature="e#11453#12317#0#PHP" expanded="false" /> - <element signature="e#12344#12744#0#PHP" expanded="false" /> - <element signature="e#12768#13341#0#PHP" expanded="false" /> - <element signature="e#13364#14174#0#PHP" expanded="false" /> + <element signature="e#10208#10636#0#PHP" expanded="false" /> + <element signature="e#10641#11432#0#PHP" expanded="false" /> + <element signature="e#11452#12316#0#PHP" expanded="false" /> + <element signature="e#12343#12743#0#PHP" expanded="false" /> + <element signature="e#12767#13340#0#PHP" expanded="false" /> + <element signature="e#13363#14173#0#PHP" expanded="false" /> </folding> </state> </provider> diff --git a/api/index/controller/OtherController.php b/api/index/controller/OtherController.php index 29c7cf3..f4a8795 100644 --- a/api/index/controller/OtherController.php +++ b/api/index/controller/OtherController.php @@ -333,7 +333,7 @@ class OtherController extends RestBaseController ->water(ROOT_PATH."public/upload/$tou",[35,48],100) ->water(ROOT_PATH."public/upload/$code",[212,700],100) ->text($text,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',14,'#FFFFFF',[142,100]) - ->text($job['job_title'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',25,'#FFFFFF',[100,200]) + ->text($job['job_title'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',25,'#FFFFFF',[55,200]) ->text($user['user_nickname'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',16,'#FFFFFF',[142,60]); $result->save($savePath."poster_".$user_id."_$job_id.png"); $this->success('SUCCESS',['url'=>cmf_get_image_url("poster/poster_".$user_id."_$job_id.png")]); -- libgit2 0.24.0