正在显示
3 个修改的文件
包含
92 行增加
和
65 行删除
@@ -2,9 +2,9 @@ | @@ -2,9 +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$/public/bg.png" afterPath="$PROJECT_DIR$/public/bg.png" /> | ||
6 | <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" /> |
7 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OtherController.php" afterPath="$PROJECT_DIR$/api/index/controller/OtherController.php" /> | 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/ResourceController.php" afterPath="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> | ||
8 | </list> | 8 | </list> |
9 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 9 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
10 | <option name="TRACKING_ENABLED" value="true" /> | 10 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -15,11 +15,11 @@ | @@ -15,11 +15,11 @@ | ||
15 | </component> | 15 | </component> |
16 | <component name="FileEditorManager"> | 16 | <component name="FileEditorManager"> |
17 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | 17 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
18 | - <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="true"> | 18 | + <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="false"> |
19 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | 19 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> |
20 | <provider selected="true" editor-type-id="text-editor"> | 20 | <provider selected="true" editor-type-id="text-editor"> |
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" /> | 21 | + <state relative-caret-position="296"> |
22 | + <caret line="300" column="37" lean-forward="true" selection-start-line="300" selection-start-column="37" selection-end-line="300" selection-end-column="37" /> | ||
23 | <folding> | 23 | <folding> |
24 | <element signature="e#129#158#0#PHP" expanded="true" /> | 24 | <element signature="e#129#158#0#PHP" expanded="true" /> |
25 | <element signature="e#325#493#0#PHP" expanded="false" /> | 25 | <element signature="e#325#493#0#PHP" expanded="false" /> |
@@ -45,6 +45,46 @@ | @@ -45,6 +45,46 @@ | ||
45 | </provider> | 45 | </provider> |
46 | </entry> | 46 | </entry> |
47 | </file> | 47 | </file> |
48 | + <file leaf-file-name="ResourceController.php" pinned="false" current-in-tab="true"> | ||
49 | + <entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php"> | ||
50 | + <provider selected="true" editor-type-id="text-editor"> | ||
51 | + <state relative-caret-position="450"> | ||
52 | + <caret line="128" column="18" lean-forward="false" selection-start-line="128" selection-start-column="18" selection-end-line="128" selection-end-column="18" /> | ||
53 | + <folding> | ||
54 | + <element signature="e#346#543#0#PHP" expanded="false" /> | ||
55 | + <element signature="e#548#956#0#PHP" expanded="false" /> | ||
56 | + <element signature="e#962#1253#0#PHP" expanded="false" /> | ||
57 | + <element signature="e#1258#2915#0#PHP" expanded="false" /> | ||
58 | + <element signature="e#4216#4690#0#PHP" expanded="false" /> | ||
59 | + <element signature="e#4697#5696#0#PHP" expanded="false" /> | ||
60 | + <element signature="e#5702#6355#0#PHP" expanded="false" /> | ||
61 | + <element signature="e#6360#7517#0#PHP" expanded="false" /> | ||
62 | + <element signature="e#7523#8226#0#PHP" expanded="false" /> | ||
63 | + <element signature="e#8231#9868#0#PHP" expanded="false" /> | ||
64 | + <element signature="e#9874#10732#0#PHP" expanded="false" /> | ||
65 | + <element signature="e#10737#12675#0#PHP" expanded="false" /> | ||
66 | + <element signature="e#12681#13521#0#PHP" expanded="false" /> | ||
67 | + <element signature="e#13526#15631#0#PHP" expanded="false" /> | ||
68 | + <element signature="e#15637#16284#0#PHP" expanded="false" /> | ||
69 | + <element signature="e#16289#17904#0#PHP" expanded="false" /> | ||
70 | + <element signature="e#17910#18326#0#PHP" expanded="false" /> | ||
71 | + <element signature="e#18331#19150#0#PHP" expanded="false" /> | ||
72 | + <element signature="e#19155#19833#0#PHP" expanded="false" /> | ||
73 | + <element signature="e#19839#20293#0#PHP" expanded="false" /> | ||
74 | + <element signature="e#20298#21156#0#PHP" expanded="false" /> | ||
75 | + <element signature="e#21162#21668#0#PHP" expanded="false" /> | ||
76 | + <element signature="e#21673#23104#0#PHP" expanded="false" /> | ||
77 | + <element signature="e#23110#23389#0#PHP" expanded="false" /> | ||
78 | + <element signature="e#23394#23836#0#PHP" expanded="false" /> | ||
79 | + <element signature="e#23842#24076#0#PHP" expanded="false" /> | ||
80 | + <element signature="e#24081#24474#0#PHP" expanded="false" /> | ||
81 | + <element signature="e#24480#24711#0#PHP" expanded="false" /> | ||
82 | + <element signature="e#24716#25074#0#PHP" expanded="false" /> | ||
83 | + </folding> | ||
84 | + </state> | ||
85 | + </provider> | ||
86 | + </entry> | ||
87 | + </file> | ||
48 | </leaf> | 88 | </leaf> |
49 | </component> | 89 | </component> |
50 | <component name="FileTemplateManagerImpl"> | 90 | <component name="FileTemplateManagerImpl"> |
@@ -103,10 +143,10 @@ | @@ -103,10 +143,10 @@ | ||
103 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html" /> | 143 | <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html" /> |
104 | <option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" /> | 144 | <option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" /> |
105 | <option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" /> | 145 | <option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" /> |
106 | - <option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> | ||
107 | <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" /> | 146 | <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" /> |
108 | <option value="$PROJECT_DIR$/api/index/controller/SendController.php" /> | 147 | <option value="$PROJECT_DIR$/api/index/controller/SendController.php" /> |
109 | <option value="$PROJECT_DIR$/api/index/controller/OtherController.php" /> | 148 | <option value="$PROJECT_DIR$/api/index/controller/OtherController.php" /> |
149 | + <option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> | ||
110 | </list> | 150 | </list> |
111 | </option> | 151 | </option> |
112 | </component> | 152 | </component> |
@@ -124,11 +164,11 @@ | @@ -124,11 +164,11 @@ | ||
124 | <sorting>DEFINITION_ORDER</sorting> | 164 | <sorting>DEFINITION_ORDER</sorting> |
125 | </component> | 165 | </component> |
126 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 166 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
127 | - <component name="ProjectFrameBounds"> | ||
128 | - <option name="x" value="174" /> | ||
129 | - <option name="y" value="120" /> | 167 | + <component name="ProjectFrameBounds" extendedState="1"> |
168 | + <option name="x" value="29" /> | ||
169 | + <option name="y" value="59" /> | ||
130 | <option name="width" value="1868" /> | 170 | <option name="width" value="1868" /> |
131 | - <option name="height" value="958" /> | 171 | + <option name="height" value="1063" /> |
132 | </component> | 172 | </component> |
133 | <component name="ProjectView"> | 173 | <component name="ProjectView"> |
134 | <navigator currentView="ProjectPane" proportions="" version="1"> | 174 | <navigator currentView="ProjectPane" proportions="" version="1"> |
@@ -172,11 +212,6 @@ | @@ -172,11 +212,6 @@ | ||
172 | <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> | 212 | <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> |
173 | <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> | 213 | <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> |
174 | </path> | 214 | </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> | ||
180 | </expand> | 215 | </expand> |
181 | <select /> | 216 | <select /> |
182 | </subPane> | 217 | </subPane> |
@@ -256,15 +291,15 @@ | @@ -256,15 +291,15 @@ | ||
256 | <workItem from="1569486627319" duration="2740000" /> | 291 | <workItem from="1569486627319" duration="2740000" /> |
257 | <workItem from="1569494185536" duration="1054000" /> | 292 | <workItem from="1569494185536" duration="1054000" /> |
258 | <workItem from="1569544728303" duration="25104000" /> | 293 | <workItem from="1569544728303" duration="25104000" /> |
259 | - <workItem from="1569716359574" duration="9691000" /> | 294 | + <workItem from="1569716359574" duration="14315000" /> |
260 | </task> | 295 | </task> |
261 | <servers /> | 296 | <servers /> |
262 | </component> | 297 | </component> |
263 | <component name="TimeTrackingManager"> | 298 | <component name="TimeTrackingManager"> |
264 | - <option name="totallyTimeSpent" value="408682000" /> | 299 | + <option name="totallyTimeSpent" value="413306000" /> |
265 | </component> | 300 | </component> |
266 | <component name="ToolWindowManager"> | 301 | <component name="ToolWindowManager"> |
267 | - <frame x="174" y="120" width="1868" height="958" extended-state="0" /> | 302 | + <frame x="29" y="59" width="1868" height="1063" extended-state="1" /> |
268 | <editor active="true" /> | 303 | <editor active="true" /> |
269 | <layout> | 304 | <layout> |
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" /> | 305 | <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" /> |
@@ -543,48 +578,6 @@ | @@ -543,48 +578,6 @@ | ||
543 | </state> | 578 | </state> |
544 | </provider> | 579 | </provider> |
545 | </entry> | 580 | </entry> |
546 | - <entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php"> | ||
547 | - <provider selected="true" editor-type-id="text-editor"> | ||
548 | - <state relative-caret-position="1150"> | ||
549 | - <caret line="757" column="5" lean-forward="true" selection-start-line="757" selection-start-column="5" selection-end-line="757" selection-end-column="5" /> | ||
550 | - <folding> | ||
551 | - <element signature="e#346#543#0#PHP" expanded="false" /> | ||
552 | - <element signature="e#548#956#0#PHP" expanded="false" /> | ||
553 | - <element signature="e#962#1253#0#PHP" expanded="false" /> | ||
554 | - <element signature="e#1258#2915#0#PHP" expanded="false" /> | ||
555 | - <element signature="e#2921#3205#0#PHP" expanded="false" /> | ||
556 | - <element signature="e#3210#3449#0#PHP" expanded="false" /> | ||
557 | - <element signature="e#3455#3779#0#PHP" expanded="false" /> | ||
558 | - <element signature="e#3784#4315#0#PHP" expanded="false" /> | ||
559 | - <element signature="e#4321#4795#0#PHP" expanded="false" /> | ||
560 | - <element signature="e#4802#5801#0#PHP" expanded="false" /> | ||
561 | - <element signature="e#5807#6460#0#PHP" expanded="false" /> | ||
562 | - <element signature="e#6465#7622#0#PHP" expanded="false" /> | ||
563 | - <element signature="e#7628#8331#0#PHP" expanded="false" /> | ||
564 | - <element signature="e#8336#9973#0#PHP" expanded="false" /> | ||
565 | - <element signature="e#9979#10837#0#PHP" expanded="false" /> | ||
566 | - <element signature="e#10842#12780#0#PHP" expanded="false" /> | ||
567 | - <element signature="e#12786#13626#0#PHP" expanded="false" /> | ||
568 | - <element signature="e#13631#15736#0#PHP" expanded="false" /> | ||
569 | - <element signature="e#15742#16389#0#PHP" expanded="false" /> | ||
570 | - <element signature="e#16394#18009#0#PHP" expanded="false" /> | ||
571 | - <element signature="e#18015#18431#0#PHP" expanded="false" /> | ||
572 | - <element signature="e#18436#19255#0#PHP" expanded="false" /> | ||
573 | - <element signature="e#19260#19938#0#PHP" expanded="false" /> | ||
574 | - <element signature="e#19944#20398#0#PHP" expanded="false" /> | ||
575 | - <element signature="e#20403#21261#0#PHP" expanded="false" /> | ||
576 | - <element signature="e#21267#21773#0#PHP" expanded="false" /> | ||
577 | - <element signature="e#21778#23209#0#PHP" expanded="false" /> | ||
578 | - <element signature="e#23215#23494#0#PHP" expanded="false" /> | ||
579 | - <element signature="e#23499#23941#0#PHP" expanded="false" /> | ||
580 | - <element signature="e#23947#24181#0#PHP" expanded="false" /> | ||
581 | - <element signature="e#24186#24579#0#PHP" expanded="false" /> | ||
582 | - <element signature="e#24585#24816#0#PHP" expanded="false" /> | ||
583 | - <element signature="e#24821#25179#0#PHP" expanded="false" /> | ||
584 | - </folding> | ||
585 | - </state> | ||
586 | - </provider> | ||
587 | - </entry> | ||
588 | <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> | 581 | <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> |
589 | <provider selected="true" editor-type-id="text-editor"> | 582 | <provider selected="true" editor-type-id="text-editor"> |
590 | <state relative-caret-position="325"> | 583 | <state relative-caret-position="325"> |
@@ -694,8 +687,8 @@ | @@ -694,8 +687,8 @@ | ||
694 | </entry> | 687 | </entry> |
695 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | 688 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> |
696 | <provider selected="true" editor-type-id="text-editor"> | 689 | <provider selected="true" editor-type-id="text-editor"> |
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" /> | 690 | + <state relative-caret-position="296"> |
691 | + <caret line="300" column="37" lean-forward="true" selection-start-line="300" selection-start-column="37" selection-end-line="300" selection-end-column="37" /> | ||
699 | <folding> | 692 | <folding> |
700 | <element signature="e#129#158#0#PHP" expanded="true" /> | 693 | <element signature="e#129#158#0#PHP" expanded="true" /> |
701 | <element signature="e#325#493#0#PHP" expanded="false" /> | 694 | <element signature="e#325#493#0#PHP" expanded="false" /> |
@@ -720,5 +713,43 @@ | @@ -720,5 +713,43 @@ | ||
720 | </state> | 713 | </state> |
721 | </provider> | 714 | </provider> |
722 | </entry> | 715 | </entry> |
716 | + <entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php"> | ||
717 | + <provider selected="true" editor-type-id="text-editor"> | ||
718 | + <state relative-caret-position="450"> | ||
719 | + <caret line="128" column="18" lean-forward="false" selection-start-line="128" selection-start-column="18" selection-end-line="128" selection-end-column="18" /> | ||
720 | + <folding> | ||
721 | + <element signature="e#346#543#0#PHP" expanded="false" /> | ||
722 | + <element signature="e#548#956#0#PHP" expanded="false" /> | ||
723 | + <element signature="e#962#1253#0#PHP" expanded="false" /> | ||
724 | + <element signature="e#1258#2915#0#PHP" expanded="false" /> | ||
725 | + <element signature="e#4216#4690#0#PHP" expanded="false" /> | ||
726 | + <element signature="e#4697#5696#0#PHP" expanded="false" /> | ||
727 | + <element signature="e#5702#6355#0#PHP" expanded="false" /> | ||
728 | + <element signature="e#6360#7517#0#PHP" expanded="false" /> | ||
729 | + <element signature="e#7523#8226#0#PHP" expanded="false" /> | ||
730 | + <element signature="e#8231#9868#0#PHP" expanded="false" /> | ||
731 | + <element signature="e#9874#10732#0#PHP" expanded="false" /> | ||
732 | + <element signature="e#10737#12675#0#PHP" expanded="false" /> | ||
733 | + <element signature="e#12681#13521#0#PHP" expanded="false" /> | ||
734 | + <element signature="e#13526#15631#0#PHP" expanded="false" /> | ||
735 | + <element signature="e#15637#16284#0#PHP" expanded="false" /> | ||
736 | + <element signature="e#16289#17904#0#PHP" expanded="false" /> | ||
737 | + <element signature="e#17910#18326#0#PHP" expanded="false" /> | ||
738 | + <element signature="e#18331#19150#0#PHP" expanded="false" /> | ||
739 | + <element signature="e#19155#19833#0#PHP" expanded="false" /> | ||
740 | + <element signature="e#19839#20293#0#PHP" expanded="false" /> | ||
741 | + <element signature="e#20298#21156#0#PHP" expanded="false" /> | ||
742 | + <element signature="e#21162#21668#0#PHP" expanded="false" /> | ||
743 | + <element signature="e#21673#23104#0#PHP" expanded="false" /> | ||
744 | + <element signature="e#23110#23389#0#PHP" expanded="false" /> | ||
745 | + <element signature="e#23394#23836#0#PHP" expanded="false" /> | ||
746 | + <element signature="e#23842#24076#0#PHP" expanded="false" /> | ||
747 | + <element signature="e#24081#24474#0#PHP" expanded="false" /> | ||
748 | + <element signature="e#24480#24711#0#PHP" expanded="false" /> | ||
749 | + <element signature="e#24716#25074#0#PHP" expanded="false" /> | ||
750 | + </folding> | ||
751 | + </state> | ||
752 | + </provider> | ||
753 | + </entry> | ||
723 | </component> | 754 | </component> |
724 | </project> | 755 | </project> |
@@ -128,8 +128,6 @@ class ResourceController extends RestBaseController | @@ -128,8 +128,6 @@ class ResourceController extends RestBaseController | ||
128 | * @url /index/Resource/city | 128 | * @url /index/Resource/city |
129 | * @method GET | 129 | * @method GET |
130 | * | 130 | * |
131 | - * @header name:XX-Token require:1 default: desc:token | ||
132 | - * | ||
133 | * @param name:sign_id type:int require:1 other:desc:省份的标识id | 131 | * @param name:sign_id type:int require:1 other:desc:省份的标识id |
134 | * | 132 | * |
135 | * @return id:城市ID | 133 | * @return id:城市ID |
@@ -137,7 +135,6 @@ class ResourceController extends RestBaseController | @@ -137,7 +135,6 @@ class ResourceController extends RestBaseController | ||
137 | */ | 135 | */ |
138 | public function city() | 136 | public function city() |
139 | { | 137 | { |
140 | - $user_id = $this->getUserId(); | ||
141 | $id = $this->request->param('sign_id'); | 138 | $id = $this->request->param('sign_id'); |
142 | if(empty($id)){ | 139 | if(empty($id)){ |
143 | $data = Db::name('area') | 140 | $data = Db::name('area') |
-
请 注册 或 登录 后发表评论