正在显示
3 个修改的文件
包含
225 行增加
和
114 行删除
@@ -2,7 +2,9 @@ | @@ -2,7 +2,9 @@ | ||
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$/api/index/controller/ResourceController.php" afterPath="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> | 5 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> |
6 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OtherController.php" afterPath="$PROJECT_DIR$/api/index/controller/OtherController.php" /> | ||
7 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/SendController.php" afterPath="$PROJECT_DIR$/api/index/controller/SendController.php" /> | ||
6 | </list> | 8 | </list> |
7 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 9 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
8 | <option name="TRACKING_ENABLED" value="true" /> | 10 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -13,65 +15,49 @@ | @@ -13,65 +15,49 @@ | ||
13 | </component> | 15 | </component> |
14 | <component name="FileEditorManager"> | 16 | <component name="FileEditorManager"> |
15 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | 17 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
16 | - <file leaf-file-name="ResourceController.php" pinned="false" current-in-tab="true"> | ||
17 | - <entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php"> | 18 | + <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="false"> |
19 | + <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | ||
18 | <provider selected="true" editor-type-id="text-editor"> | 20 | <provider selected="true" editor-type-id="text-editor"> |
19 | - <state relative-caret-position="207"> | ||
20 | - <caret line="138" column="5" lean-forward="true" selection-start-line="138" selection-start-column="5" selection-end-line="138" selection-end-column="5" /> | 21 | + <state relative-caret-position="661"> |
22 | + <caret line="325" column="5" lean-forward="true" selection-start-line="325" selection-start-column="5" selection-end-line="325" selection-end-column="5" /> | ||
21 | <folding> | 23 | <folding> |
22 | - <element signature="e#346#543#0#PHP" expanded="false" /> | ||
23 | - <element signature="e#548#956#0#PHP" expanded="false" /> | ||
24 | - <element signature="e#962#1253#0#PHP" expanded="false" /> | ||
25 | - <element signature="e#1258#2915#0#PHP" expanded="false" /> | ||
26 | - <element signature="e#2921#3205#0#PHP" expanded="false" /> | ||
27 | - <element signature="e#3210#3449#0#PHP" expanded="false" /> | ||
28 | - <element signature="e#3455#3779#0#PHP" expanded="false" /> | ||
29 | - <element signature="e#4321#4795#0#PHP" expanded="false" /> | ||
30 | - <element signature="e#4802#5801#0#PHP" expanded="false" /> | ||
31 | - <element signature="e#5807#6460#0#PHP" expanded="false" /> | ||
32 | - <element signature="e#6465#7622#0#PHP" expanded="false" /> | ||
33 | - <element signature="e#7628#8331#0#PHP" expanded="false" /> | ||
34 | - <element signature="e#8336#9973#0#PHP" expanded="false" /> | ||
35 | - <element signature="e#9979#10837#0#PHP" expanded="false" /> | ||
36 | - <element signature="e#10842#12780#0#PHP" expanded="false" /> | ||
37 | - <element signature="e#12786#13626#0#PHP" expanded="false" /> | ||
38 | - <element signature="e#13631#15736#0#PHP" expanded="false" /> | ||
39 | - <element signature="e#15742#16389#0#PHP" expanded="false" /> | ||
40 | - <element signature="e#16394#18009#0#PHP" expanded="false" /> | ||
41 | - <element signature="e#18015#18431#0#PHP" expanded="false" /> | ||
42 | - <element signature="e#18436#19255#0#PHP" expanded="false" /> | ||
43 | - <element signature="e#19260#19938#0#PHP" expanded="false" /> | ||
44 | - <element signature="e#19944#20398#0#PHP" expanded="false" /> | ||
45 | - <element signature="e#20403#21261#0#PHP" expanded="false" /> | ||
46 | - <element signature="e#21267#21773#0#PHP" expanded="false" /> | ||
47 | - <element signature="e#21778#23209#0#PHP" expanded="false" /> | ||
48 | - <element signature="e#23215#23494#0#PHP" expanded="false" /> | ||
49 | - <element signature="e#23499#23941#0#PHP" expanded="false" /> | ||
50 | - <element signature="e#23947#24181#0#PHP" expanded="false" /> | ||
51 | - <element signature="e#24186#24579#0#PHP" expanded="false" /> | ||
52 | - <element signature="e#24585#24816#0#PHP" expanded="false" /> | ||
53 | - <element signature="e#24821#25179#0#PHP" expanded="false" /> | 24 | + <element signature="e#129#158#0#PHP" expanded="true" /> |
25 | + <element signature="e#325#493#0#PHP" expanded="false" /> | ||
26 | + <element signature="e#498#807#0#PHP" expanded="false" /> | ||
27 | + <element signature="e#813#979#0#PHP" expanded="false" /> | ||
28 | + <element signature="e#984#1287#0#PHP" expanded="false" /> | ||
29 | + <element signature="e#1293#1934#0#PHP" expanded="false" /> | ||
30 | + <element signature="e#1939#3023#0#PHP" expanded="false" /> | ||
31 | + <element signature="e#3029#3393#0#PHP" expanded="false" /> | ||
32 | + <element signature="e#3398#3872#0#PHP" expanded="false" /> | ||
33 | + <element signature="e#3878#4149#0#PHP" expanded="false" /> | ||
34 | + <element signature="e#4154#5087#0#PHP" expanded="false" /> | ||
35 | + <element signature="e#5093#5402#0#PHP" expanded="false" /> | ||
36 | + <element signature="e#5407#5707#0#PHP" expanded="false" /> | ||
37 | + <element signature="e#5717#5996#0#PHP" expanded="false" /> | ||
38 | + <element signature="e#6001#6927#0#PHP" expanded="false" /> | ||
39 | + <element signature="e#6933#7237#0#PHP" expanded="false" /> | ||
40 | + <element signature="e#7242#7631#0#PHP" expanded="false" /> | ||
54 | </folding> | 41 | </folding> |
55 | </state> | 42 | </state> |
56 | </provider> | 43 | </provider> |
57 | </entry> | 44 | </entry> |
58 | </file> | 45 | </file> |
59 | - <file leaf-file-name="SendController.php" pinned="false" current-in-tab="false"> | 46 | + <file leaf-file-name="SendController.php" pinned="false" current-in-tab="true"> |
60 | <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> | 47 | <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> |
61 | <provider selected="true" editor-type-id="text-editor"> | 48 | <provider selected="true" editor-type-id="text-editor"> |
62 | <state relative-caret-position="125"> | 49 | <state relative-caret-position="125"> |
63 | - <caret line="15" column="3" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" /> | 50 | + <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" /> |
64 | <folding> | 51 | <folding> |
65 | <element signature="e#296#1102#0#PHP" expanded="false" /> | 52 | <element signature="e#296#1102#0#PHP" expanded="false" /> |
66 | <element signature="e#1108#2740#0#PHP" expanded="false" /> | 53 | <element signature="e#1108#2740#0#PHP" expanded="false" /> |
67 | <element signature="e#2746#2930#0#PHP" expanded="false" /> | 54 | <element signature="e#2746#2930#0#PHP" expanded="false" /> |
68 | - <element signature="e#2935#3129#0#PHP" expanded="false" /> | ||
69 | - <element signature="e#3135#4309#0#PHP" expanded="false" /> | ||
70 | - <element signature="e#4314#6247#0#PHP" expanded="false" /> | ||
71 | - <element signature="e#6253#7185#0#PHP" expanded="false" /> | ||
72 | - <element signature="e#7190#8833#0#PHP" expanded="false" /> | ||
73 | - <element signature="e#8839#9648#0#PHP" expanded="false" /> | ||
74 | - <element signature="e#9653#11247#0#PHP" expanded="false" /> | 55 | + <element signature="e#3433#4607#0#PHP" expanded="false" /> |
56 | + <element signature="e#4612#6545#0#PHP" expanded="false" /> | ||
57 | + <element signature="e#6551#7483#0#PHP" expanded="false" /> | ||
58 | + <element signature="e#7488#9131#0#PHP" expanded="false" /> | ||
59 | + <element signature="e#9137#9946#0#PHP" expanded="false" /> | ||
60 | + <element signature="e#9951#11545#0#PHP" expanded="false" /> | ||
75 | </folding> | 61 | </folding> |
76 | </state> | 62 | </state> |
77 | </provider> | 63 | </provider> |
@@ -100,7 +86,6 @@ | @@ -100,7 +86,6 @@ | ||
100 | <list> | 86 | <list> |
101 | <option value="$PROJECT_DIR$/data/conf/database.php" /> | 87 | <option value="$PROJECT_DIR$/data/conf/database.php" /> |
102 | <option value="$PROJECT_DIR$/.gitlab-ci.yml" /> | 88 | <option value="$PROJECT_DIR$/.gitlab-ci.yml" /> |
103 | - <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" /> | ||
104 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" /> | 89 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" /> |
105 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/account.html" /> | 90 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/account.html" /> |
106 | <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" /> | 91 | <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" /> |
@@ -122,7 +107,6 @@ | @@ -122,7 +107,6 @@ | ||
122 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/index.html" /> | 107 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/index.html" /> |
123 | <option value="$PROJECT_DIR$/app/admin/controller/ActiveController.php" /> | 108 | <option value="$PROJECT_DIR$/app/admin/controller/ActiveController.php" /> |
124 | <option value="$PROJECT_DIR$/api/config.php" /> | 109 | <option value="$PROJECT_DIR$/api/config.php" /> |
125 | - <option value="$PROJECT_DIR$/api/index/controller/OtherController.php" /> | ||
126 | <option value="$PROJECT_DIR$/app/admin/controller/FinanceController.php" /> | 110 | <option value="$PROJECT_DIR$/app/admin/controller/FinanceController.php" /> |
127 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/finance/edit.html" /> | 111 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/finance/edit.html" /> |
128 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/edit.html" /> | 112 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/edit.html" /> |
@@ -137,8 +121,10 @@ | @@ -137,8 +121,10 @@ | ||
137 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html" /> | 121 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html" /> |
138 | <option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" /> | 122 | <option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" /> |
139 | <option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" /> | 123 | <option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" /> |
140 | - <option value="$PROJECT_DIR$/api/index/controller/SendController.php" /> | ||
141 | <option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> | 124 | <option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> |
125 | + <option value="$PROJECT_DIR$/api/index/controller/OtherController.php" /> | ||
126 | + <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" /> | ||
127 | + <option value="$PROJECT_DIR$/api/index/controller/SendController.php" /> | ||
142 | </list> | 128 | </list> |
143 | </option> | 129 | </option> |
144 | </component> | 130 | </component> |
@@ -156,11 +142,11 @@ | @@ -156,11 +142,11 @@ | ||
156 | <sorting>DEFINITION_ORDER</sorting> | 142 | <sorting>DEFINITION_ORDER</sorting> |
157 | </component> | 143 | </component> |
158 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 144 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
159 | - <component name="ProjectFrameBounds"> | ||
160 | - <option name="x" value="363" /> | ||
161 | - <option name="y" value="46" /> | 145 | + <component name="ProjectFrameBounds" extendedState="1"> |
146 | + <option name="x" value="317" /> | ||
147 | + <option name="y" value="91" /> | ||
162 | <option name="width" value="1661" /> | 148 | <option name="width" value="1661" /> |
163 | - <option name="height" value="940" /> | 149 | + <option name="height" value="937" /> |
164 | </component> | 150 | </component> |
165 | <component name="ProjectView"> | 151 | <component name="ProjectView"> |
166 | <navigator currentView="ProjectPane" proportions="" version="1"> | 152 | <navigator currentView="ProjectPane" proportions="" version="1"> |
@@ -203,6 +189,24 @@ | @@ -203,6 +189,24 @@ | ||
203 | <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> | 189 | <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> |
204 | <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> | 190 | <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> |
205 | </path> | 191 | </path> |
192 | + <path> | ||
193 | + <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
194 | + <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
195 | + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
196 | + </path> | ||
197 | + <path> | ||
198 | + <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
199 | + <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
200 | + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
201 | + <item name="upload" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
202 | + </path> | ||
203 | + <path> | ||
204 | + <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
205 | + <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
206 | + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
207 | + <item name="upload" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
208 | + <item name="portal" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
209 | + </path> | ||
206 | </expand> | 210 | </expand> |
207 | <select /> | 211 | <select /> |
208 | </subPane> | 212 | </subPane> |
@@ -212,7 +216,7 @@ | @@ -212,7 +216,7 @@ | ||
212 | </component> | 216 | </component> |
213 | <component name="PropertiesComponent"> | 217 | <component name="PropertiesComponent"> |
214 | <property name="WebServerToolWindowFactoryState" value="false" /> | 218 | <property name="WebServerToolWindowFactoryState" value="false" /> |
215 | - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" /> | 219 | + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/zhaozhao" /> |
216 | <property name="DefaultHtmlFileTemplate" value="HTML File" /> | 220 | <property name="DefaultHtmlFileTemplate" value="HTML File" /> |
217 | </component> | 221 | </component> |
218 | <component name="RecentsManager"> | 222 | <component name="RecentsManager"> |
@@ -278,15 +282,15 @@ | @@ -278,15 +282,15 @@ | ||
278 | <workItem from="1569484124771" duration="560000" /> | 282 | <workItem from="1569484124771" duration="560000" /> |
279 | <workItem from="1569486627319" duration="2740000" /> | 283 | <workItem from="1569486627319" duration="2740000" /> |
280 | <workItem from="1569494185536" duration="1054000" /> | 284 | <workItem from="1569494185536" duration="1054000" /> |
281 | - <workItem from="1569544728303" duration="9610000" /> | 285 | + <workItem from="1569544728303" duration="16455000" /> |
282 | </task> | 286 | </task> |
283 | <servers /> | 287 | <servers /> |
284 | </component> | 288 | </component> |
285 | <component name="TimeTrackingManager"> | 289 | <component name="TimeTrackingManager"> |
286 | - <option name="totallyTimeSpent" value="383497000" /> | 290 | + <option name="totallyTimeSpent" value="390342000" /> |
287 | </component> | 291 | </component> |
288 | <component name="ToolWindowManager"> | 292 | <component name="ToolWindowManager"> |
289 | - <frame x="363" y="46" width="1661" height="940" extended-state="0" /> | 293 | + <frame x="317" y="91" width="1661" height="937" extended-state="1" /> |
290 | <editor active="true" /> | 294 | <editor active="true" /> |
291 | <layout> | 295 | <layout> |
292 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20424734" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | 296 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20424734" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> |
@@ -321,8 +325,6 @@ | @@ -321,8 +325,6 @@ | ||
321 | <watches-manager /> | 325 | <watches-manager /> |
322 | </component> | 326 | </component> |
323 | <component name="editorHistoryManager"> | 327 | <component name="editorHistoryManager"> |
324 | - <entry file="file://$PROJECT_DIR$/public/uploads/20190917/039879fe0b83499ad11ea5bdbe89e755.png" /> | ||
325 | - <entry file="file://$PROJECT_DIR$/public/uploads/20190917/be1562958a2c53342707fdab5df02092.png" /> | ||
326 | <entry file="file://$PROJECT_DIR$/app/database.php"> | 328 | <entry file="file://$PROJECT_DIR$/app/database.php"> |
327 | <provider selected="true" editor-type-id="text-editor"> | 329 | <provider selected="true" editor-type-id="text-editor"> |
328 | <state relative-caret-position="0"> | 330 | <state relative-caret-position="0"> |
@@ -491,13 +493,6 @@ | @@ -491,13 +493,6 @@ | ||
491 | </state> | 493 | </state> |
492 | </provider> | 494 | </provider> |
493 | </entry> | 495 | </entry> |
494 | - <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | ||
495 | - <provider selected="true" editor-type-id="text-editor"> | ||
496 | - <state relative-caret-position="394"> | ||
497 | - <caret line="59" column="5" lean-forward="true" selection-start-line="59" selection-start-column="5" selection-end-line="59" selection-end-column="5" /> | ||
498 | - </state> | ||
499 | - </provider> | ||
500 | - </entry> | ||
501 | <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/finance/edit.html"> | 496 | <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/finance/edit.html"> |
502 | <provider selected="true" editor-type-id="text-editor"> | 497 | <provider selected="true" editor-type-id="text-editor"> |
503 | <state relative-caret-position="-1320"> | 498 | <state relative-caret-position="-1320"> |
@@ -561,13 +556,6 @@ | @@ -561,13 +556,6 @@ | ||
561 | </state> | 556 | </state> |
562 | </provider> | 557 | </provider> |
563 | </entry> | 558 | </entry> |
564 | - <entry file="file://$PROJECT_DIR$/api/index/controller/ActiveController.php"> | ||
565 | - <provider selected="true" editor-type-id="text-editor"> | ||
566 | - <state relative-caret-position="421"> | ||
567 | - <caret line="197" column="0" lean-forward="true" selection-start-line="197" selection-start-column="0" selection-end-line="197" selection-end-column="0" /> | ||
568 | - </state> | ||
569 | - </provider> | ||
570 | - </entry> | ||
571 | <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/edit.html"> | 559 | <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/edit.html"> |
572 | <provider selected="true" editor-type-id="text-editor"> | 560 | <provider selected="true" editor-type-id="text-editor"> |
573 | <state relative-caret-position="200"> | 561 | <state relative-caret-position="200"> |
@@ -582,27 +570,6 @@ | @@ -582,27 +570,6 @@ | ||
582 | </state> | 570 | </state> |
583 | </provider> | 571 | </provider> |
584 | </entry> | 572 | </entry> |
585 | - <entry file="file://$PROJECT_DIR$/api/index/controller/MyinfoController.php"> | ||
586 | - <provider selected="true" editor-type-id="text-editor"> | ||
587 | - <state relative-caret-position="-2335"> | ||
588 | - <caret line="22" column="7" lean-forward="false" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" /> | ||
589 | - </state> | ||
590 | - </provider> | ||
591 | - </entry> | ||
592 | - <entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php"> | ||
593 | - <provider selected="true" editor-type-id="text-editor"> | ||
594 | - <state relative-caret-position="665"> | ||
595 | - <caret line="431" column="5" lean-forward="true" selection-start-line="431" selection-start-column="5" selection-end-line="431" selection-end-column="5" /> | ||
596 | - </state> | ||
597 | - </provider> | ||
598 | - </entry> | ||
599 | - <entry file="file://$PROJECT_DIR$/api/index/controller/FinanceController.php"> | ||
600 | - <provider selected="true" editor-type-id="text-editor"> | ||
601 | - <state relative-caret-position="375"> | ||
602 | - <caret line="43" column="27" lean-forward="false" selection-start-line="43" selection-start-column="27" selection-end-line="43" selection-end-column="27" /> | ||
603 | - </state> | ||
604 | - </provider> | ||
605 | - </entry> | ||
606 | <entry file="file://$PROJECT_DIR$/app/admin/controller/ActiveController.php"> | 573 | <entry file="file://$PROJECT_DIR$/app/admin/controller/ActiveController.php"> |
607 | <provider selected="true" editor-type-id="text-editor"> | 574 | <provider selected="true" editor-type-id="text-editor"> |
608 | <state relative-caret-position="325"> | 575 | <state relative-caret-position="325"> |
@@ -638,29 +605,50 @@ | @@ -638,29 +605,50 @@ | ||
638 | </state> | 605 | </state> |
639 | </provider> | 606 | </provider> |
640 | </entry> | 607 | </entry> |
641 | - <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> | 608 | + <entry file="file://$PROJECT_DIR$/api/index/model/JobModel.php"> |
642 | <provider selected="true" editor-type-id="text-editor"> | 609 | <provider selected="true" editor-type-id="text-editor"> |
643 | - <state relative-caret-position="125"> | ||
644 | - <caret line="15" column="3" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" /> | ||
645 | - <folding> | ||
646 | - <element signature="e#296#1102#0#PHP" expanded="false" /> | ||
647 | - <element signature="e#1108#2740#0#PHP" expanded="false" /> | ||
648 | - <element signature="e#2746#2930#0#PHP" expanded="false" /> | ||
649 | - <element signature="e#2935#3129#0#PHP" expanded="false" /> | ||
650 | - <element signature="e#3135#4309#0#PHP" expanded="false" /> | ||
651 | - <element signature="e#4314#6247#0#PHP" expanded="false" /> | ||
652 | - <element signature="e#6253#7185#0#PHP" expanded="false" /> | ||
653 | - <element signature="e#7190#8833#0#PHP" expanded="false" /> | ||
654 | - <element signature="e#8839#9648#0#PHP" expanded="false" /> | ||
655 | - <element signature="e#9653#11247#0#PHP" expanded="false" /> | ||
656 | - </folding> | 610 | + <state relative-caret-position="0"> |
611 | + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
612 | + <folding /> | ||
613 | + </state> | ||
614 | + </provider> | ||
615 | + </entry> | ||
616 | + <entry file="file://$PROJECT_DIR$/api/index/controller/ActiveController.php"> | ||
617 | + <provider selected="true" editor-type-id="text-editor"> | ||
618 | + <state relative-caret-position="1321"> | ||
619 | + <caret line="197" column="0" lean-forward="true" selection-start-line="197" selection-start-column="0" selection-end-line="197" selection-end-column="0" /> | ||
620 | + <folding /> | ||
621 | + </state> | ||
622 | + </provider> | ||
623 | + </entry> | ||
624 | + <entry file="file://$PROJECT_DIR$/api/index/controller/FinanceController.php"> | ||
625 | + <provider selected="true" editor-type-id="text-editor"> | ||
626 | + <state relative-caret-position="900"> | ||
627 | + <caret line="43" column="27" lean-forward="false" selection-start-line="43" selection-start-column="27" selection-end-line="43" selection-end-column="27" /> | ||
628 | + <folding /> | ||
629 | + </state> | ||
630 | + </provider> | ||
631 | + </entry> | ||
632 | + <entry file="file://$PROJECT_DIR$/api/index/controller/MyinfoController.php"> | ||
633 | + <provider selected="true" editor-type-id="text-editor"> | ||
634 | + <state relative-caret-position="-2806"> | ||
635 | + <caret line="22" column="7" lean-forward="false" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" /> | ||
636 | + <folding /> | ||
637 | + </state> | ||
638 | + </provider> | ||
639 | + </entry> | ||
640 | + <entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php"> | ||
641 | + <provider selected="true" editor-type-id="text-editor"> | ||
642 | + <state relative-caret-position="8281"> | ||
643 | + <caret line="431" column="5" lean-forward="true" selection-start-line="431" selection-start-column="5" selection-end-line="431" selection-end-column="5" /> | ||
644 | + <folding /> | ||
657 | </state> | 645 | </state> |
658 | </provider> | 646 | </provider> |
659 | </entry> | 647 | </entry> |
660 | <entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php"> | 648 | <entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php"> |
661 | <provider selected="true" editor-type-id="text-editor"> | 649 | <provider selected="true" editor-type-id="text-editor"> |
662 | - <state relative-caret-position="207"> | ||
663 | - <caret line="138" column="5" lean-forward="true" selection-start-line="138" selection-start-column="5" selection-end-line="138" selection-end-column="5" /> | 650 | + <state relative-caret-position="1150"> |
651 | + <caret line="757" column="5" lean-forward="true" selection-start-line="757" selection-start-column="5" selection-end-line="757" selection-end-column="5" /> | ||
664 | <folding> | 652 | <folding> |
665 | <element signature="e#346#543#0#PHP" expanded="false" /> | 653 | <element signature="e#346#543#0#PHP" expanded="false" /> |
666 | <element signature="e#548#956#0#PHP" expanded="false" /> | 654 | <element signature="e#548#956#0#PHP" expanded="false" /> |
@@ -669,6 +657,7 @@ | @@ -669,6 +657,7 @@ | ||
669 | <element signature="e#2921#3205#0#PHP" expanded="false" /> | 657 | <element signature="e#2921#3205#0#PHP" expanded="false" /> |
670 | <element signature="e#3210#3449#0#PHP" expanded="false" /> | 658 | <element signature="e#3210#3449#0#PHP" expanded="false" /> |
671 | <element signature="e#3455#3779#0#PHP" expanded="false" /> | 659 | <element signature="e#3455#3779#0#PHP" expanded="false" /> |
660 | + <element signature="e#3784#4315#0#PHP" expanded="false" /> | ||
672 | <element signature="e#4321#4795#0#PHP" expanded="false" /> | 661 | <element signature="e#4321#4795#0#PHP" expanded="false" /> |
673 | <element signature="e#4802#5801#0#PHP" expanded="false" /> | 662 | <element signature="e#4802#5801#0#PHP" expanded="false" /> |
674 | <element signature="e#5807#6460#0#PHP" expanded="false" /> | 663 | <element signature="e#5807#6460#0#PHP" expanded="false" /> |
@@ -698,5 +687,57 @@ | @@ -698,5 +687,57 @@ | ||
698 | </state> | 687 | </state> |
699 | </provider> | 688 | </provider> |
700 | </entry> | 689 | </entry> |
690 | + <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php"> | ||
691 | + <provider selected="true" editor-type-id="text-editor"> | ||
692 | + <state relative-caret-position="625"> | ||
693 | + <caret line="292" column="0" lean-forward="true" selection-start-line="292" selection-start-column="0" selection-end-line="292" selection-end-column="0" /> | ||
694 | + <folding /> | ||
695 | + </state> | ||
696 | + </provider> | ||
697 | + </entry> | ||
698 | + <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | ||
699 | + <provider selected="true" editor-type-id="text-editor"> | ||
700 | + <state relative-caret-position="661"> | ||
701 | + <caret line="325" column="5" lean-forward="true" selection-start-line="325" selection-start-column="5" selection-end-line="325" selection-end-column="5" /> | ||
702 | + <folding> | ||
703 | + <element signature="e#129#158#0#PHP" expanded="true" /> | ||
704 | + <element signature="e#325#493#0#PHP" expanded="false" /> | ||
705 | + <element signature="e#498#807#0#PHP" expanded="false" /> | ||
706 | + <element signature="e#813#979#0#PHP" expanded="false" /> | ||
707 | + <element signature="e#984#1287#0#PHP" expanded="false" /> | ||
708 | + <element signature="e#1293#1934#0#PHP" expanded="false" /> | ||
709 | + <element signature="e#1939#3023#0#PHP" expanded="false" /> | ||
710 | + <element signature="e#3029#3393#0#PHP" expanded="false" /> | ||
711 | + <element signature="e#3398#3872#0#PHP" expanded="false" /> | ||
712 | + <element signature="e#3878#4149#0#PHP" expanded="false" /> | ||
713 | + <element signature="e#4154#5087#0#PHP" expanded="false" /> | ||
714 | + <element signature="e#5093#5402#0#PHP" expanded="false" /> | ||
715 | + <element signature="e#5407#5707#0#PHP" expanded="false" /> | ||
716 | + <element signature="e#5717#5996#0#PHP" expanded="false" /> | ||
717 | + <element signature="e#6001#6927#0#PHP" expanded="false" /> | ||
718 | + <element signature="e#6933#7237#0#PHP" expanded="false" /> | ||
719 | + <element signature="e#7242#7631#0#PHP" expanded="false" /> | ||
720 | + </folding> | ||
721 | + </state> | ||
722 | + </provider> | ||
723 | + </entry> | ||
724 | + <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> | ||
725 | + <provider selected="true" editor-type-id="text-editor"> | ||
726 | + <state relative-caret-position="125"> | ||
727 | + <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" /> | ||
728 | + <folding> | ||
729 | + <element signature="e#296#1102#0#PHP" expanded="false" /> | ||
730 | + <element signature="e#1108#2740#0#PHP" expanded="false" /> | ||
731 | + <element signature="e#2746#2930#0#PHP" expanded="false" /> | ||
732 | + <element signature="e#3433#4607#0#PHP" expanded="false" /> | ||
733 | + <element signature="e#4612#6545#0#PHP" expanded="false" /> | ||
734 | + <element signature="e#6551#7483#0#PHP" expanded="false" /> | ||
735 | + <element signature="e#7488#9131#0#PHP" expanded="false" /> | ||
736 | + <element signature="e#9137#9946#0#PHP" expanded="false" /> | ||
737 | + <element signature="e#9951#11545#0#PHP" expanded="false" /> | ||
738 | + </folding> | ||
739 | + </state> | ||
740 | + </provider> | ||
741 | + </entry> | ||
701 | </component> | 742 | </component> |
702 | </project> | 743 | </project> |
@@ -9,6 +9,7 @@ | @@ -9,6 +9,7 @@ | ||
9 | namespace api\index\controller; | 9 | namespace api\index\controller; |
10 | 10 | ||
11 | 11 | ||
12 | +use api\index\model\JobModel; | ||
12 | use cmf\controller\RestBaseController; | 13 | use cmf\controller\RestBaseController; |
13 | use think\Db; | 14 | use think\Db; |
14 | use think\Validate; | 15 | use think\Validate; |
@@ -280,4 +281,64 @@ class OtherController extends RestBaseController | @@ -280,4 +281,64 @@ class OtherController extends RestBaseController | ||
280 | ->update($data); | 281 | ->update($data); |
281 | $this->success('SUCCESS',$data); | 282 | $this->success('SUCCESS',$data); |
282 | } | 283 | } |
284 | + | ||
285 | + /** | ||
286 | + * @title 生成海报 | ||
287 | + * @description | ||
288 | + * @author GuoSheng | ||
289 | + * @url /index/Other/getPoster | ||
290 | + * @method GET | ||
291 | + * | ||
292 | + * @header name:XX-Token require:1 default: desc:token | ||
293 | + * | ||
294 | + * @param name:job_id require:1 default: desc:招聘信息id | ||
295 | + * @param name:url require:1 default: desc:页面路径与参数 | ||
296 | + * | ||
297 | + * @return url:海报地址 | ||
298 | + */ | ||
299 | + public function getPoster(){ | ||
300 | + $job_id = $this->request->param('job_id',0,'intval'); | ||
301 | + $url = $this->request->param('url'); | ||
302 | + $user_id = $this->getUserId(); | ||
303 | + if(empty($user_id) || empty($job_id) || empty($url)){ | ||
304 | + $this->error(['code'=>40005,'msg'=>'缺少必要参数']); | ||
305 | + } | ||
306 | + $savePath = './../upload/poster/'; | ||
307 | + if (!file_exists($savePath)){ | ||
308 | + mkdir($savePath, 0777,true); | ||
309 | + } | ||
310 | + if(!file_exists("./upload/qrcode/code_$user_id.jpg")){ | ||
311 | + $code = $this->getCode($user_id,$job_id,$url); | ||
312 | + }else{ | ||
313 | + $code = "qrcode/code_$user_id.jpg"; | ||
314 | + } | ||
315 | + $jobModel = new JobModel(); | ||
316 | + $where['id'] = ['eq',$job_id]; | ||
317 | + $job = $jobModel->getOne($where); | ||
318 | + $image = \think\Image::open(ROOT_PATH."public/bg.png"); | ||
319 | + $result = $image->water(ROOT_PATH."public/upload/$code",[360,1420],100) | ||
320 | + ->text($job['job_name'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',45,'#070C1D',[100,1100]) | ||
321 | + ->text($job['job_city']."-".$job['job_county'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',30,'#070C1D',[700,1200]) | ||
322 | + ->text($job['wage'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',30,'#FF5D2E',[100,1200]) | ||
323 | + ->text($job['occupation_name'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',32,'#070C1D',[100,1300]); | ||
324 | + $result->save($savePath."poster_".$user_id."_$job_id.png"); | ||
325 | + $this->success('SUCCESS',['url'=>cmf_get_image_url("poster/poster_".$user_id."_$job_id.png")]); | ||
326 | + } | ||
327 | +// public function getCode($user_id,$job_id,$url){ | ||
328 | +// $savePath = './../upload/get_code/'; | ||
329 | +// $filename = "code_$user_id.jpg"; | ||
330 | +// if(!file_exists($savePath.$filename)){ | ||
331 | +// $data = [ | ||
332 | +// 'app_id' => 'wx5d55a70fea6f8f97', | ||
333 | +// 'secret' => '8e4ceb09d76596b6f74fc79fdb3331c4', | ||
334 | +// ]; | ||
335 | +// $app = new Application($data); | ||
336 | +// $accessToken = $app->access_token; | ||
337 | +// $access_token = $accessToken->getToken(); | ||
338 | +// $qrcode = $this->imgShare($user_id,$job_id,$access_token,$url); | ||
339 | +// }elsE{ | ||
340 | +// $qrcode = "qrcode/code_".$user_id."_$job_id.jpg"; | ||
341 | +// } | ||
342 | +// return $qrcode; | ||
343 | +// } | ||
283 | } | 344 | } |
@@ -99,9 +99,18 @@ class SendController extends RestBaseController | @@ -99,9 +99,18 @@ class SendController extends RestBaseController | ||
99 | public function city() | 99 | public function city() |
100 | { | 100 | { |
101 | $data = Db::name('area') | 101 | $data = Db::name('area') |
102 | - ->where('level',2) | ||
103 | - ->field('id,name') | ||
104 | - ->select(); | 102 | + ->where('level',1) |
103 | + ->field('id,name,sign_id') | ||
104 | + ->select() | ||
105 | + ->toArray(); | ||
106 | + foreach ($data as $k=>$v){ | ||
107 | + $data[$k]['child'] = Db::name('area') | ||
108 | + ->where('pid',$v['sign_id']) | ||
109 | + ->where('level',2) | ||
110 | + ->field('id,name') | ||
111 | + ->select() | ||
112 | + ->toArray(); | ||
113 | + } | ||
105 | $this->success('SUCCESS',$data); | 114 | $this->success('SUCCESS',$data); |
106 | } | 115 | } |
107 | 116 |
-
请 注册 或 登录 后发表评论