正在显示
3 个修改的文件
包含
41 行增加
和
53 行删除
@@ -13,33 +13,13 @@ | @@ -13,33 +13,13 @@ | ||
13 | <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> | 13 | <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
14 | <option name="LAST_RESOLUTION" value="IGNORE" /> | 14 | <option name="LAST_RESOLUTION" value="IGNORE" /> |
15 | </component> | 15 | </component> |
16 | - <component name="DockManager"> | ||
17 | - <window id="1"> | ||
18 | - <content type="file-editors"> | ||
19 | - <state> | ||
20 | - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | ||
21 | - <file leaf-file-name="Image.php" pinned="false" current-in-tab="true"> | ||
22 | - <entry file="file://$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php"> | ||
23 | - <provider selected="true" editor-type-id="text-editor"> | ||
24 | - <state relative-caret-position="371"> | ||
25 | - <caret line="485" column="51" lean-forward="false" selection-start-line="485" selection-start-column="51" selection-end-line="485" selection-end-column="51" /> | ||
26 | - <folding /> | ||
27 | - </state> | ||
28 | - </provider> | ||
29 | - </entry> | ||
30 | - </file> | ||
31 | - </leaf> | ||
32 | - </state> | ||
33 | - </content> | ||
34 | - </window> | ||
35 | - </component> | ||
36 | <component name="FileEditorManager"> | 16 | <component name="FileEditorManager"> |
37 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | 17 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
38 | <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="true"> | 18 | <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="true"> |
39 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | 19 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> |
40 | <provider selected="true" editor-type-id="text-editor"> | 20 | <provider selected="true" editor-type-id="text-editor"> |
41 | - <state relative-caret-position="247"> | ||
42 | - <caret line="323" column="25" lean-forward="false" selection-start-line="323" selection-start-column="25" selection-end-line="323" selection-end-column="25" /> | 21 | + <state relative-caret-position="447"> |
22 | + <caret line="325" column="24" lean-forward="true" selection-start-line="325" selection-start-column="24" selection-end-line="325" selection-end-column="24" /> | ||
43 | <folding> | 23 | <folding> |
44 | <element signature="e#129#158#0#PHP" expanded="true" /> | 24 | <element signature="e#129#158#0#PHP" expanded="true" /> |
45 | <element signature="e#325#493#0#PHP" expanded="false" /> | 25 | <element signature="e#325#493#0#PHP" expanded="false" /> |
@@ -57,9 +37,9 @@ | @@ -57,9 +37,9 @@ | ||
57 | <element signature="e#5717#5996#0#PHP" expanded="false" /> | 37 | <element signature="e#5717#5996#0#PHP" expanded="false" /> |
58 | <element signature="e#6001#6927#0#PHP" expanded="false" /> | 38 | <element signature="e#6001#6927#0#PHP" expanded="false" /> |
59 | <element signature="e#7242#7631#0#PHP" expanded="false" /> | 39 | <element signature="e#7242#7631#0#PHP" expanded="false" /> |
60 | - <element signature="e#10958#11822#0#PHP" expanded="false" /> | ||
61 | - <element signature="e#11849#12249#0#PHP" expanded="false" /> | ||
62 | - <element signature="e#12272#12845#0#PHP" expanded="false" /> | 40 | + <element signature="e#11017#11881#0#PHP" expanded="false" /> |
41 | + <element signature="e#11908#12308#0#PHP" expanded="false" /> | ||
42 | + <element signature="e#12331#12904#0#PHP" expanded="false" /> | ||
63 | </folding> | 43 | </folding> |
64 | </state> | 44 | </state> |
65 | </provider> | 45 | </provider> |
@@ -144,11 +124,11 @@ | @@ -144,11 +124,11 @@ | ||
144 | <sorting>DEFINITION_ORDER</sorting> | 124 | <sorting>DEFINITION_ORDER</sorting> |
145 | </component> | 125 | </component> |
146 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 126 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
147 | - <component name="ProjectFrameBounds" extendedState="1"> | ||
148 | - <option name="x" value="51" /> | ||
149 | - <option name="y" value="80" /> | 127 | + <component name="ProjectFrameBounds"> |
128 | + <option name="x" value="174" /> | ||
129 | + <option name="y" value="120" /> | ||
150 | <option name="width" value="1868" /> | 130 | <option name="width" value="1868" /> |
151 | - <option name="height" value="959" /> | 131 | + <option name="height" value="958" /> |
152 | </component> | 132 | </component> |
153 | <component name="ProjectView"> | 133 | <component name="ProjectView"> |
154 | <navigator currentView="ProjectPane" proportions="" version="1"> | 134 | <navigator currentView="ProjectPane" proportions="" version="1"> |
@@ -192,6 +172,11 @@ | @@ -192,6 +172,11 @@ | ||
192 | <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> | 172 | <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> |
193 | <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> | 173 | <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> |
194 | </path> | 174 | </path> |
175 | + <path> | ||
176 | + <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
177 | + <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
178 | + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
179 | + </path> | ||
195 | </expand> | 180 | </expand> |
196 | <select /> | 181 | <select /> |
197 | </subPane> | 182 | </subPane> |
@@ -271,17 +256,18 @@ | @@ -271,17 +256,18 @@ | ||
271 | <workItem from="1569486627319" duration="2740000" /> | 256 | <workItem from="1569486627319" duration="2740000" /> |
272 | <workItem from="1569494185536" duration="1054000" /> | 257 | <workItem from="1569494185536" duration="1054000" /> |
273 | <workItem from="1569544728303" duration="25104000" /> | 258 | <workItem from="1569544728303" duration="25104000" /> |
274 | - <workItem from="1569716359574" duration="8561000" /> | 259 | + <workItem from="1569716359574" duration="9691000" /> |
275 | </task> | 260 | </task> |
276 | <servers /> | 261 | <servers /> |
277 | </component> | 262 | </component> |
278 | <component name="TimeTrackingManager"> | 263 | <component name="TimeTrackingManager"> |
279 | - <option name="totallyTimeSpent" value="407552000" /> | 264 | + <option name="totallyTimeSpent" value="408682000" /> |
280 | </component> | 265 | </component> |
281 | <component name="ToolWindowManager"> | 266 | <component name="ToolWindowManager"> |
282 | - <frame x="51" y="80" width="1868" height="959" extended-state="1" /> | 267 | + <frame x="174" y="120" width="1868" height="958" extended-state="0" /> |
268 | + <editor active="true" /> | ||
283 | <layout> | 269 | <layout> |
284 | - <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" /> | 270 | + <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" /> |
285 | <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" /> | 271 | <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" /> |
286 | <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" /> | 272 | <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" /> |
287 | <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" /> | 273 | <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 @@ | @@ -313,13 +299,6 @@ | ||
313 | <watches-manager /> | 299 | <watches-manager /> |
314 | </component> | 300 | </component> |
315 | <component name="editorHistoryManager"> | 301 | <component name="editorHistoryManager"> |
316 | - <entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php"> | ||
317 | - <provider selected="true" editor-type-id="text-editor"> | ||
318 | - <state relative-caret-position="-8003"> | ||
319 | - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
320 | - </state> | ||
321 | - </provider> | ||
322 | - </entry> | ||
323 | <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/attestation/index.html"> | 302 | <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/attestation/index.html"> |
324 | <provider selected="true" editor-type-id="text-editor"> | 303 | <provider selected="true" editor-type-id="text-editor"> |
325 | <state relative-caret-position="0"> | 304 | <state relative-caret-position="0"> |
@@ -692,6 +671,22 @@ | @@ -692,6 +671,22 @@ | ||
692 | <state /> | 671 | <state /> |
693 | </provider> | 672 | </provider> |
694 | </entry> | 673 | </entry> |
674 | + <entry file="file://$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php"> | ||
675 | + <provider selected="true" editor-type-id="text-editor"> | ||
676 | + <state relative-caret-position="371"> | ||
677 | + <caret line="485" column="51" lean-forward="false" selection-start-line="485" selection-start-column="51" selection-end-line="485" selection-end-column="51" /> | ||
678 | + <folding /> | ||
679 | + </state> | ||
680 | + </provider> | ||
681 | + </entry> | ||
682 | + <entry file="file://$PROJECT_DIR$/public/index.php"> | ||
683 | + <provider selected="true" editor-type-id="text-editor"> | ||
684 | + <state relative-caret-position="0"> | ||
685 | + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
686 | + <folding /> | ||
687 | + </state> | ||
688 | + </provider> | ||
689 | + </entry> | ||
695 | <entry file="file://$PROJECT_DIR$/public/bg.png"> | 690 | <entry file="file://$PROJECT_DIR$/public/bg.png"> |
696 | <provider selected="true" editor-type-id="images"> | 691 | <provider selected="true" editor-type-id="images"> |
697 | <state /> | 692 | <state /> |
@@ -699,8 +694,8 @@ | @@ -699,8 +694,8 @@ | ||
699 | </entry> | 694 | </entry> |
700 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | 695 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> |
701 | <provider selected="true" editor-type-id="text-editor"> | 696 | <provider selected="true" editor-type-id="text-editor"> |
702 | - <state relative-caret-position="247"> | ||
703 | - <caret line="323" column="25" lean-forward="false" selection-start-line="323" selection-start-column="25" selection-end-line="323" selection-end-column="25" /> | 697 | + <state relative-caret-position="447"> |
698 | + <caret line="325" column="24" lean-forward="true" selection-start-line="325" selection-start-column="24" selection-end-line="325" selection-end-column="24" /> | ||
704 | <folding> | 699 | <folding> |
705 | <element signature="e#129#158#0#PHP" expanded="true" /> | 700 | <element signature="e#129#158#0#PHP" expanded="true" /> |
706 | <element signature="e#325#493#0#PHP" expanded="false" /> | 701 | <element signature="e#325#493#0#PHP" expanded="false" /> |
@@ -718,20 +713,12 @@ | @@ -718,20 +713,12 @@ | ||
718 | <element signature="e#5717#5996#0#PHP" expanded="false" /> | 713 | <element signature="e#5717#5996#0#PHP" expanded="false" /> |
719 | <element signature="e#6001#6927#0#PHP" expanded="false" /> | 714 | <element signature="e#6001#6927#0#PHP" expanded="false" /> |
720 | <element signature="e#7242#7631#0#PHP" expanded="false" /> | 715 | <element signature="e#7242#7631#0#PHP" expanded="false" /> |
721 | - <element signature="e#10958#11822#0#PHP" expanded="false" /> | ||
722 | - <element signature="e#11849#12249#0#PHP" expanded="false" /> | ||
723 | - <element signature="e#12272#12845#0#PHP" expanded="false" /> | 716 | + <element signature="e#11017#11881#0#PHP" expanded="false" /> |
717 | + <element signature="e#11908#12308#0#PHP" expanded="false" /> | ||
718 | + <element signature="e#12331#12904#0#PHP" expanded="false" /> | ||
724 | </folding> | 719 | </folding> |
725 | </state> | 720 | </state> |
726 | </provider> | 721 | </provider> |
727 | </entry> | 722 | </entry> |
728 | - <entry file="file://$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php"> | ||
729 | - <provider selected="true" editor-type-id="text-editor"> | ||
730 | - <state relative-caret-position="371"> | ||
731 | - <caret line="485" column="51" lean-forward="false" selection-start-line="485" selection-start-column="51" selection-end-line="485" selection-end-column="51" /> | ||
732 | - <folding /> | ||
733 | - </state> | ||
734 | - </provider> | ||
735 | - </entry> | ||
736 | </component> | 723 | </component> |
737 | </project> | 724 | </project> |
@@ -324,6 +324,7 @@ class OtherController extends RestBaseController | @@ -324,6 +324,7 @@ class OtherController extends RestBaseController | ||
324 | $text = "期待你的加入"; | 324 | $text = "期待你的加入"; |
325 | $remark = "长按识别二维码识别小程序"; | 325 | $remark = "长按识别二维码识别小程序"; |
326 | $result = $image | 326 | $result = $image |
327 | + ->water(ROOT_PATH."public/upload/$code",9,100) | ||
327 | ->text($remark,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',14,'#FFFFFF',[54,434]) | 328 | ->text($remark,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',14,'#FFFFFF',[54,434]) |
328 | ->text($text,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',12,'#FFFFFF',[112,167]) | 329 | ->text($text,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',12,'#FFFFFF',[112,167]) |
329 | ->text($job['job_title'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',20,'#FFFFFF',[60,212]) | 330 | ->text($job['job_title'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',20,'#FFFFFF',[60,212]) |
-
请 注册 或 登录 后发表评论