From 04e459521a689756145ea99b96d384906e7f94d4 Mon Sep 17 00:00:00 2001 From: guosheng <gs@bronet.cn> Date: Sun, 29 Sep 2019 11:01:16 +0800 Subject: [PATCH] 背景图片 --- .idea/workspace.xml | 93 ++++++++++++++++++++++++++++++++++++++++----------------------------------------------------- api/index/controller/OtherController.php | 1 + public/bg.png | Bin 32302 -> 0 bytes 3 files changed, 41 insertions(+), 53 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index dd89729..a6ee8ff 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -13,33 +13,13 @@ <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 SIDE_TABS_SIZE_LIMIT_KEY="300"> - <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="371"> - <caret line="485" column="51" lean-forward="false" selection-start-line="485" selection-start-column="51" selection-end-line="485" selection-end-column="51" /> - <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="247"> - <caret line="323" column="25" lean-forward="false" selection-start-line="323" selection-start-column="25" selection-end-line="323" selection-end-column="25" /> + <state relative-caret-position="447"> + <caret line="325" column="24" lean-forward="true" selection-start-line="325" selection-start-column="24" selection-end-line="325" selection-end-column="24" /> <folding> <element signature="e#129#158#0#PHP" expanded="true" /> <element signature="e#325#493#0#PHP" expanded="false" /> @@ -57,9 +37,9 @@ <element signature="e#5717#5996#0#PHP" expanded="false" /> <element signature="e#6001#6927#0#PHP" expanded="false" /> <element signature="e#7242#7631#0#PHP" expanded="false" /> - <element signature="e#10958#11822#0#PHP" expanded="false" /> - <element signature="e#11849#12249#0#PHP" expanded="false" /> - <element signature="e#12272#12845#0#PHP" expanded="false" /> + <element signature="e#11017#11881#0#PHP" expanded="false" /> + <element signature="e#11908#12308#0#PHP" expanded="false" /> + <element signature="e#12331#12904#0#PHP" expanded="false" /> </folding> </state> </provider> @@ -144,11 +124,11 @@ <sorting>DEFINITION_ORDER</sorting> </component> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> - <component name="ProjectFrameBounds" extendedState="1"> - <option name="x" value="51" /> - <option name="y" value="80" /> + <component name="ProjectFrameBounds"> + <option name="x" value="174" /> + <option name="y" value="120" /> <option name="width" value="1868" /> - <option name="height" value="959" /> + <option name="height" value="958" /> </component> <component name="ProjectView"> <navigator currentView="ProjectPane" proportions="" version="1"> @@ -192,6 +172,11 @@ <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> </path> + <path> + <item name="resource" type="b2602c69:ProjectViewProjectNode" /> + <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> + </path> </expand> <select /> </subPane> @@ -271,17 +256,18 @@ <workItem from="1569486627319" duration="2740000" /> <workItem from="1569494185536" duration="1054000" /> <workItem from="1569544728303" duration="25104000" /> - <workItem from="1569716359574" duration="8561000" /> + <workItem from="1569716359574" duration="9691000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="407552000" /> + <option name="totallyTimeSpent" value="408682000" /> </component> <component name="ToolWindowManager"> - <frame x="51" y="80" width="1868" height="959" extended-state="1" /> + <frame x="174" y="120" width="1868" height="958" extended-state="0" /> + <editor active="true" /> <layout> - <window_info id="Project" active="true" 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" /> + <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" /> <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" /> <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" /> <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" /> @@ -313,13 +299,6 @@ <watches-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-8003"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/attestation/index.html"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> @@ -692,6 +671,22 @@ <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="371"> + <caret line="485" column="51" lean-forward="false" selection-start-line="485" selection-start-column="51" selection-end-line="485" selection-end-column="51" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/public/index.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/public/bg.png"> <provider selected="true" editor-type-id="images"> <state /> @@ -699,8 +694,8 @@ </entry> <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="247"> - <caret line="323" column="25" lean-forward="false" selection-start-line="323" selection-start-column="25" selection-end-line="323" selection-end-column="25" /> + <state relative-caret-position="447"> + <caret line="325" column="24" lean-forward="true" selection-start-line="325" selection-start-column="24" selection-end-line="325" selection-end-column="24" /> <folding> <element signature="e#129#158#0#PHP" expanded="true" /> <element signature="e#325#493#0#PHP" expanded="false" /> @@ -718,20 +713,12 @@ <element signature="e#5717#5996#0#PHP" expanded="false" /> <element signature="e#6001#6927#0#PHP" expanded="false" /> <element signature="e#7242#7631#0#PHP" expanded="false" /> - <element signature="e#10958#11822#0#PHP" expanded="false" /> - <element signature="e#11849#12249#0#PHP" expanded="false" /> - <element signature="e#12272#12845#0#PHP" expanded="false" /> + <element signature="e#11017#11881#0#PHP" expanded="false" /> + <element signature="e#11908#12308#0#PHP" expanded="false" /> + <element signature="e#12331#12904#0#PHP" expanded="false" /> </folding> </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="371"> - <caret line="485" column="51" lean-forward="false" selection-start-line="485" selection-start-column="51" selection-end-line="485" selection-end-column="51" /> - <folding /> - </state> - </provider> - </entry> </component> </project> \ No newline at end of file diff --git a/api/index/controller/OtherController.php b/api/index/controller/OtherController.php index a5e38d7..a566388 100644 --- a/api/index/controller/OtherController.php +++ b/api/index/controller/OtherController.php @@ -324,6 +324,7 @@ class OtherController extends RestBaseController $text = "期待你的加入"; $remark = "长按识别二维码识别小程序"; $result = $image + ->water(ROOT_PATH."public/upload/$code",9,100) ->text($remark,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',14,'#FFFFFF',[54,434]) ->text($text,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',12,'#FFFFFF',[112,167]) ->text($job['job_title'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',20,'#FFFFFF',[60,212]) diff --git a/public/bg.png b/public/bg.png index f5d81ba..f017079 100644 Binary files a/public/bg.png and b/public/bg.png differ -- libgit2 0.24.0