正在显示
2 个修改的文件
包含
139 行增加
和
66 行删除
@@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | 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/FinanceController.php" afterPath="$PROJECT_DIR$/api/index/controller/FinanceController.php" /> | 6 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OtherController.php" afterPath="$PROJECT_DIR$/api/index/controller/OtherController.php" /> |
7 | </list> | 7 | </list> |
8 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 8 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
9 | <option name="TRACKING_ENABLED" value="true" /> | 9 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -13,7 +13,42 @@ | @@ -13,7 +13,42 @@ | ||
13 | <option name="LAST_RESOLUTION" value="IGNORE" /> | 13 | <option name="LAST_RESOLUTION" value="IGNORE" /> |
14 | </component> | 14 | </component> |
15 | <component name="FileEditorManager"> | 15 | <component name="FileEditorManager"> |
16 | - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" /> | 16 | + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
17 | + <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="true"> | ||
18 | + <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | ||
19 | + <provider selected="true" editor-type-id="text-editor"> | ||
20 | + <state relative-caret-position="244"> | ||
21 | + <caret line="357" column="44" lean-forward="true" selection-start-line="357" selection-start-column="44" selection-end-line="357" selection-end-column="44" /> | ||
22 | + <folding> | ||
23 | + <element signature="e#129#158#0#PHP" expanded="true" /> | ||
24 | + <element signature="e#344#512#0#PHP" expanded="false" /> | ||
25 | + <element signature="e#517#826#0#PHP" expanded="false" /> | ||
26 | + <element signature="e#832#998#0#PHP" expanded="false" /> | ||
27 | + <element signature="e#1003#1306#0#PHP" expanded="false" /> | ||
28 | + <element signature="e#1312#1953#0#PHP" expanded="false" /> | ||
29 | + <element signature="e#1958#3042#0#PHP" expanded="false" /> | ||
30 | + <element signature="e#3048#3412#0#PHP" expanded="false" /> | ||
31 | + <element signature="e#3417#3891#0#PHP" expanded="false" /> | ||
32 | + <element signature="e#3897#4168#0#PHP" expanded="false" /> | ||
33 | + <element signature="e#4173#5106#0#PHP" expanded="false" /> | ||
34 | + <element signature="e#5112#5421#0#PHP" expanded="false" /> | ||
35 | + <element signature="e#5426#5726#0#PHP" expanded="false" /> | ||
36 | + <element signature="e#5736#6015#0#PHP" expanded="false" /> | ||
37 | + <element signature="e#6020#6946#0#PHP" expanded="false" /> | ||
38 | + <element signature="e#6952#7256#0#PHP" expanded="false" /> | ||
39 | + <element signature="e#7261#7650#0#PHP" expanded="false" /> | ||
40 | + <element signature="e#7656#8029#0#PHP" expanded="false" /> | ||
41 | + <element signature="e#8034#10202#0#PHP" expanded="false" /> | ||
42 | + <element signature="e#10208#10636#0#PHP" expanded="false" /> | ||
43 | + <element signature="e#12327#12727#0#PHP" expanded="false" /> | ||
44 | + <element signature="e#12751#13324#0#PHP" expanded="false" /> | ||
45 | + <element signature="e#13347#14157#0#PHP" expanded="false" /> | ||
46 | + </folding> | ||
47 | + </state> | ||
48 | + </provider> | ||
49 | + </entry> | ||
50 | + </file> | ||
51 | + </leaf> | ||
17 | </component> | 52 | </component> |
18 | <component name="FileTemplateManagerImpl"> | 53 | <component name="FileTemplateManagerImpl"> |
19 | <option name="RECENT_TEMPLATES"> | 54 | <option name="RECENT_TEMPLATES"> |
@@ -76,8 +111,8 @@ | @@ -76,8 +111,8 @@ | ||
76 | <option value="$PROJECT_DIR$/api/index/controller/SendController.php" /> | 111 | <option value="$PROJECT_DIR$/api/index/controller/SendController.php" /> |
77 | <option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" /> | 112 | <option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" /> |
78 | <option value="$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php" /> | 113 | <option value="$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php" /> |
79 | - <option value="$PROJECT_DIR$/api/index/controller/OtherController.php" /> | ||
80 | <option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" /> | 114 | <option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" /> |
115 | + <option value="$PROJECT_DIR$/api/index/controller/OtherController.php" /> | ||
81 | </list> | 116 | </list> |
82 | </option> | 117 | </option> |
83 | </component> | 118 | </component> |
@@ -96,10 +131,10 @@ | @@ -96,10 +131,10 @@ | ||
96 | </component> | 131 | </component> |
97 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 132 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
98 | <component name="ProjectFrameBounds" extendedState="1"> | 133 | <component name="ProjectFrameBounds" extendedState="1"> |
99 | - <option name="x" value="7" /> | ||
100 | - <option name="y" value="118" /> | 134 | + <option name="x" value="-122" /> |
135 | + <option name="y" value="153" /> | ||
101 | <option name="width" value="1868" /> | 136 | <option name="width" value="1868" /> |
102 | - <option name="height" value="1056" /> | 137 | + <option name="height" value="1087" /> |
103 | </component> | 138 | </component> |
104 | <component name="ProjectView"> | 139 | <component name="ProjectView"> |
105 | <navigator currentView="ProjectPane" proportions="" version="1"> | 140 | <navigator currentView="ProjectPane" proportions="" version="1"> |
@@ -128,6 +163,37 @@ | @@ -128,6 +163,37 @@ | ||
128 | <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | 163 | <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> |
129 | <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> | 164 | <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> |
130 | </path> | 165 | </path> |
166 | + <path> | ||
167 | + <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
168 | + <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
169 | + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
170 | + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
171 | + </path> | ||
172 | + <path> | ||
173 | + <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
174 | + <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
175 | + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
176 | + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
177 | + <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
178 | + </path> | ||
179 | + <path> | ||
180 | + <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
181 | + <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
182 | + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
183 | + </path> | ||
184 | + <path> | ||
185 | + <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
186 | + <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
187 | + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
188 | + <item name="upload" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
189 | + </path> | ||
190 | + <path> | ||
191 | + <item name="resource" type="b2602c69:ProjectViewProjectNode" /> | ||
192 | + <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
193 | + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
194 | + <item name="upload" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
195 | + <item name="qrcode" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
196 | + </path> | ||
131 | </expand> | 197 | </expand> |
132 | <select /> | 198 | <select /> |
133 | </subPane> | 199 | </subPane> |
@@ -142,13 +208,13 @@ | @@ -142,13 +208,13 @@ | ||
142 | <property name="DefaultHtmlFileTemplate" value="HTML File" /> | 208 | <property name="DefaultHtmlFileTemplate" value="HTML File" /> |
143 | </component> | 209 | </component> |
144 | <component name="RecentsManager"> | 210 | <component name="RecentsManager"> |
145 | - <key name="MoveFile.RECENT_KEYS"> | ||
146 | - <recent name="D:\htdocs\project1\resource\public" /> | ||
147 | - </key> | ||
148 | <key name="CopyFile.RECENT_KEYS"> | 211 | <key name="CopyFile.RECENT_KEYS"> |
149 | <recent name="D:\htdocs\project1\resource\public\static\font-awesome\fonts" /> | 212 | <recent name="D:\htdocs\project1\resource\public\static\font-awesome\fonts" /> |
150 | <recent name="D:\htdocs\project1\resource\api\index\controller" /> | 213 | <recent name="D:\htdocs\project1\resource\api\index\controller" /> |
151 | </key> | 214 | </key> |
215 | + <key name="MoveFile.RECENT_KEYS"> | ||
216 | + <recent name="D:\htdocs\project1\resource\public" /> | ||
217 | + </key> | ||
152 | </component> | 218 | </component> |
153 | <component name="RunDashboard"> | 219 | <component name="RunDashboard"> |
154 | <option name="ruleStates"> | 220 | <option name="ruleStates"> |
@@ -216,17 +282,18 @@ | @@ -216,17 +282,18 @@ | ||
216 | <workItem from="1570493724514" duration="1402000" /> | 282 | <workItem from="1570493724514" duration="1402000" /> |
217 | <workItem from="1570498610111" duration="50000" /> | 283 | <workItem from="1570498610111" duration="50000" /> |
218 | <workItem from="1570523418252" duration="1729000" /> | 284 | <workItem from="1570523418252" duration="1729000" /> |
219 | - <workItem from="1570588094186" duration="1910000" /> | 285 | + <workItem from="1570588094186" duration="7684000" /> |
220 | </task> | 286 | </task> |
221 | <servers /> | 287 | <servers /> |
222 | </component> | 288 | </component> |
223 | <component name="TimeTrackingManager"> | 289 | <component name="TimeTrackingManager"> |
224 | - <option name="totallyTimeSpent" value="450437000" /> | 290 | + <option name="totallyTimeSpent" value="456211000" /> |
225 | </component> | 291 | </component> |
226 | <component name="ToolWindowManager"> | 292 | <component name="ToolWindowManager"> |
227 | - <frame x="7" y="118" width="1868" height="1056" extended-state="1" /> | 293 | + <frame x="-122" y="153" width="1868" height="1087" extended-state="1" /> |
294 | + <editor active="true" /> | ||
228 | <layout> | 295 | <layout> |
229 | - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1465708" 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.1465708" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> |
230 | <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" /> | 297 | <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" /> |
231 | <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" /> | 298 | <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" /> |
232 | <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" /> | 299 | <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" /> |
@@ -258,13 +325,6 @@ | @@ -258,13 +325,6 @@ | ||
258 | <watches-manager /> | 325 | <watches-manager /> |
259 | </component> | 326 | </component> |
260 | <component name="editorHistoryManager"> | 327 | <component name="editorHistoryManager"> |
261 | - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/financsend/index.html"> | ||
262 | - <provider selected="true" editor-type-id="text-editor"> | ||
263 | - <state relative-caret-position="628"> | ||
264 | - <caret line="73" column="31" lean-forward="true" selection-start-line="73" selection-start-column="31" selection-end-line="73" selection-end-column="31" /> | ||
265 | - </state> | ||
266 | - </provider> | ||
267 | - </entry> | ||
268 | <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php"> | 328 | <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php"> |
269 | <provider selected="true" editor-type-id="text-editor"> | 329 | <provider selected="true" editor-type-id="text-editor"> |
270 | <state relative-caret-position="257"> | 330 | <state relative-caret-position="257"> |
@@ -437,12 +497,6 @@ | @@ -437,12 +497,6 @@ | ||
437 | </state> | 497 | </state> |
438 | </provider> | 498 | </provider> |
439 | </entry> | 499 | </entry> |
440 | - <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_10_22.jpg" /> | ||
441 | - <entry file="file://$PROJECT_DIR$/public/favicon.ico"> | ||
442 | - <provider selected="true" editor-type-id="images"> | ||
443 | - <state /> | ||
444 | - </provider> | ||
445 | - </entry> | ||
446 | <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php"> | 500 | <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php"> |
447 | <provider selected="true" editor-type-id="text-editor"> | 501 | <provider selected="true" editor-type-id="text-editor"> |
448 | <state relative-caret-position="25"> | 502 | <state relative-caret-position="25"> |
@@ -474,13 +528,6 @@ | @@ -474,13 +528,6 @@ | ||
474 | </state> | 528 | </state> |
475 | </provider> | 529 | </provider> |
476 | </entry> | 530 | </entry> |
477 | - <entry file="file://$PROJECT_DIR$/app/admin/controller/ActiveController.php"> | ||
478 | - <provider selected="true" editor-type-id="text-editor"> | ||
479 | - <state relative-caret-position="1300"> | ||
480 | - <caret line="69" column="13" lean-forward="true" selection-start-line="69" selection-start-column="13" selection-end-line="69" selection-end-column="13" /> | ||
481 | - </state> | ||
482 | - </provider> | ||
483 | - </entry> | ||
484 | <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/http/http.php"> | 531 | <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/http/http.php"> |
485 | <provider selected="true" editor-type-id="text-editor"> | 532 | <provider selected="true" editor-type-id="text-editor"> |
486 | <state relative-caret-position="294"> | 533 | <state relative-caret-position="294"> |
@@ -494,26 +541,6 @@ | @@ -494,26 +541,6 @@ | ||
494 | </provider> | 541 | </provider> |
495 | </entry> | 542 | </entry> |
496 | <entry file="file://$PROJECT_DIR$/public/upload/qrcode/1569753725.jpg" /> | 543 | <entry file="file://$PROJECT_DIR$/public/upload/qrcode/1569753725.jpg" /> |
497 | - <entry file="file://$PROJECT_DIR$/public/upload/poster/poster_14_22.png"> | ||
498 | - <provider selected="true" editor-type-id="images"> | ||
499 | - <state /> | ||
500 | - </provider> | ||
501 | - </entry> | ||
502 | - <entry file="file://$PROJECT_DIR$/public/upload/poster/poster_11_22.png"> | ||
503 | - <provider selected="true" editor-type-id="images"> | ||
504 | - <state /> | ||
505 | - </provider> | ||
506 | - </entry> | ||
507 | - <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_11_22.jpg"> | ||
508 | - <provider selected="true" editor-type-id="images"> | ||
509 | - <state /> | ||
510 | - </provider> | ||
511 | - </entry> | ||
512 | - <entry file="file://$PROJECT_DIR$/public/upload/qrcode/tou.11.jpg"> | ||
513 | - <provider selected="true" editor-type-id="images"> | ||
514 | - <state /> | ||
515 | - </provider> | ||
516 | - </entry> | ||
517 | <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/gd/gd.php"> | 544 | <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/gd/gd.php"> |
518 | <provider selected="true" editor-type-id="text-editor"> | 545 | <provider selected="true" editor-type-id="text-editor"> |
519 | <state relative-caret-position="135"> | 546 | <state relative-caret-position="135"> |
@@ -521,11 +548,6 @@ | @@ -521,11 +548,6 @@ | ||
521 | </state> | 548 | </state> |
522 | </provider> | 549 | </provider> |
523 | </entry> | 550 | </entry> |
524 | - <entry file="file://$PROJECT_DIR$/public/bg.png"> | ||
525 | - <provider selected="true" editor-type-id="images"> | ||
526 | - <state /> | ||
527 | - </provider> | ||
528 | - </entry> | ||
529 | <entry file="file://$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php"> | 551 | <entry file="file://$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php"> |
530 | <provider selected="true" editor-type-id="text-editor"> | 552 | <provider selected="true" editor-type-id="text-editor"> |
531 | <state relative-caret-position="260"> | 553 | <state relative-caret-position="260"> |
@@ -590,10 +612,63 @@ | @@ -590,10 +612,63 @@ | ||
590 | </state> | 612 | </state> |
591 | </provider> | 613 | </provider> |
592 | </entry> | 614 | </entry> |
615 | + <entry file="file://$PROJECT_DIR$/app/admin/controller/ActiveController.php"> | ||
616 | + <provider selected="true" editor-type-id="text-editor"> | ||
617 | + <state relative-caret-position="250"> | ||
618 | + <caret line="18" column="28" lean-forward="false" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" /> | ||
619 | + <folding> | ||
620 | + <element signature="e#282#1940#0#PHP" expanded="false" /> | ||
621 | + </folding> | ||
622 | + </state> | ||
623 | + </provider> | ||
624 | + </entry> | ||
625 | + <entry file="file://$PROJECT_DIR$/public/hello.html"> | ||
626 | + <provider selected="true" editor-type-id="text-editor"> | ||
627 | + <state relative-caret-position="0"> | ||
628 | + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
629 | + <folding /> | ||
630 | + </state> | ||
631 | + </provider> | ||
632 | + </entry> | ||
633 | + <entry file="file://$PROJECT_DIR$/public/favicon.ico"> | ||
634 | + <provider selected="true" editor-type-id="images"> | ||
635 | + <state /> | ||
636 | + </provider> | ||
637 | + </entry> | ||
638 | + <entry file="file://$PROJECT_DIR$/public/bg.png"> | ||
639 | + <provider selected="true" editor-type-id="images"> | ||
640 | + <state /> | ||
641 | + </provider> | ||
642 | + </entry> | ||
643 | + <entry file="file://$PROJECT_DIR$/public/upload/poster/poster_14_22.png"> | ||
644 | + <provider selected="true" editor-type-id="images"> | ||
645 | + <state /> | ||
646 | + </provider> | ||
647 | + </entry> | ||
648 | + <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_10_22.jpg"> | ||
649 | + <provider selected="true" editor-type-id="images"> | ||
650 | + <state /> | ||
651 | + </provider> | ||
652 | + </entry> | ||
653 | + <entry file="file://$PROJECT_DIR$/public/upload/poster/poster_11_22.png"> | ||
654 | + <provider selected="true" editor-type-id="images"> | ||
655 | + <state /> | ||
656 | + </provider> | ||
657 | + </entry> | ||
658 | + <entry file="file://$PROJECT_DIR$/public/upload/qrcode/tou.11.jpg"> | ||
659 | + <provider selected="true" editor-type-id="images"> | ||
660 | + <state /> | ||
661 | + </provider> | ||
662 | + </entry> | ||
663 | + <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_11_22.jpg"> | ||
664 | + <provider selected="true" editor-type-id="images"> | ||
665 | + <state /> | ||
666 | + </provider> | ||
667 | + </entry> | ||
593 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | 668 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> |
594 | <provider selected="true" editor-type-id="text-editor"> | 669 | <provider selected="true" editor-type-id="text-editor"> |
595 | - <state relative-caret-position="1020"> | ||
596 | - <caret line="300" column="32" lean-forward="false" selection-start-line="300" selection-start-column="32" selection-end-line="300" selection-end-column="32" /> | 670 | + <state relative-caret-position="244"> |
671 | + <caret line="357" column="44" lean-forward="true" selection-start-line="357" selection-start-column="44" selection-end-line="357" selection-end-column="44" /> | ||
597 | <folding> | 672 | <folding> |
598 | <element signature="e#129#158#0#PHP" expanded="true" /> | 673 | <element signature="e#129#158#0#PHP" expanded="true" /> |
599 | <element signature="e#344#512#0#PHP" expanded="false" /> | 674 | <element signature="e#344#512#0#PHP" expanded="false" /> |
@@ -615,11 +690,9 @@ | @@ -615,11 +690,9 @@ | ||
615 | <element signature="e#7656#8029#0#PHP" expanded="false" /> | 690 | <element signature="e#7656#8029#0#PHP" expanded="false" /> |
616 | <element signature="e#8034#10202#0#PHP" expanded="false" /> | 691 | <element signature="e#8034#10202#0#PHP" expanded="false" /> |
617 | <element signature="e#10208#10636#0#PHP" expanded="false" /> | 692 | <element signature="e#10208#10636#0#PHP" expanded="false" /> |
618 | - <element signature="e#10641#11432#0#PHP" expanded="false" /> | ||
619 | - <element signature="e#11452#12316#0#PHP" expanded="false" /> | ||
620 | - <element signature="e#12343#12743#0#PHP" expanded="false" /> | ||
621 | - <element signature="e#12767#13340#0#PHP" expanded="false" /> | ||
622 | - <element signature="e#13363#14173#0#PHP" expanded="false" /> | 693 | + <element signature="e#12327#12727#0#PHP" expanded="false" /> |
694 | + <element signature="e#12751#13324#0#PHP" expanded="false" /> | ||
695 | + <element signature="e#13347#14157#0#PHP" expanded="false" /> | ||
623 | </folding> | 696 | </folding> |
624 | </state> | 697 | </state> |
625 | </provider> | 698 | </provider> |
@@ -351,7 +351,7 @@ class OtherController extends RestBaseController | @@ -351,7 +351,7 @@ class OtherController extends RestBaseController | ||
351 | return $qrcode; | 351 | return $qrcode; |
352 | } | 352 | } |
353 | public function imgShare($user_id,$job_id,$access_token,$path){ | 353 | public function imgShare($user_id,$job_id,$access_token,$path){ |
354 | - $url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=".$access_token; | 354 | + $url = "https://api.weixin.qq.com/wxa/getwxacode?access_token=".$access_token; |
355 | $post['path'] = $path; | 355 | $post['path'] = $path; |
356 | $post['width'] = 280; | 356 | $post['width'] = 280; |
357 | $result = $this->curl($url, json_encode($post)); | 357 | $result = $this->curl($url, json_encode($post)); |
-
请 注册 或 登录 后发表评论