diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a6ee8ff..5f6d1a4 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,9 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/bg.png" afterPath="$PROJECT_DIR$/public/bg.png" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OtherController.php" afterPath="$PROJECT_DIR$/api/index/controller/OtherController.php" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ResourceController.php" afterPath="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -15,11 +15,11 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="true"> + <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="447"> - <caret line="325" column="24" lean-forward="true" selection-start-line="325" selection-start-column="24" selection-end-line="325" selection-end-column="24" /> + <state relative-caret-position="296"> + <caret line="300" column="37" lean-forward="true" selection-start-line="300" selection-start-column="37" selection-end-line="300" selection-end-column="37" /> <folding> <element signature="e#129#158#0#PHP" expanded="true" /> <element signature="e#325#493#0#PHP" expanded="false" /> @@ -45,6 +45,46 @@ </provider> </entry> </file> + <file leaf-file-name="ResourceController.php" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="450"> + <caret line="128" column="18" lean-forward="false" selection-start-line="128" selection-start-column="18" selection-end-line="128" selection-end-column="18" /> + <folding> + <element signature="e#346#543#0#PHP" expanded="false" /> + <element signature="e#548#956#0#PHP" expanded="false" /> + <element signature="e#962#1253#0#PHP" expanded="false" /> + <element signature="e#1258#2915#0#PHP" expanded="false" /> + <element signature="e#4216#4690#0#PHP" expanded="false" /> + <element signature="e#4697#5696#0#PHP" expanded="false" /> + <element signature="e#5702#6355#0#PHP" expanded="false" /> + <element signature="e#6360#7517#0#PHP" expanded="false" /> + <element signature="e#7523#8226#0#PHP" expanded="false" /> + <element signature="e#8231#9868#0#PHP" expanded="false" /> + <element signature="e#9874#10732#0#PHP" expanded="false" /> + <element signature="e#10737#12675#0#PHP" expanded="false" /> + <element signature="e#12681#13521#0#PHP" expanded="false" /> + <element signature="e#13526#15631#0#PHP" expanded="false" /> + <element signature="e#15637#16284#0#PHP" expanded="false" /> + <element signature="e#16289#17904#0#PHP" expanded="false" /> + <element signature="e#17910#18326#0#PHP" expanded="false" /> + <element signature="e#18331#19150#0#PHP" expanded="false" /> + <element signature="e#19155#19833#0#PHP" expanded="false" /> + <element signature="e#19839#20293#0#PHP" expanded="false" /> + <element signature="e#20298#21156#0#PHP" expanded="false" /> + <element signature="e#21162#21668#0#PHP" expanded="false" /> + <element signature="e#21673#23104#0#PHP" expanded="false" /> + <element signature="e#23110#23389#0#PHP" expanded="false" /> + <element signature="e#23394#23836#0#PHP" expanded="false" /> + <element signature="e#23842#24076#0#PHP" expanded="false" /> + <element signature="e#24081#24474#0#PHP" expanded="false" /> + <element signature="e#24480#24711#0#PHP" expanded="false" /> + <element signature="e#24716#25074#0#PHP" expanded="false" /> + </folding> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FileTemplateManagerImpl"> @@ -103,10 +143,10 @@ <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html" /> <option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" /> <option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" /> - <option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" /> <option value="$PROJECT_DIR$/api/index/controller/SendController.php" /> <option value="$PROJECT_DIR$/api/index/controller/OtherController.php" /> + <option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> </list> </option> </component> @@ -124,11 +164,11 @@ <sorting>DEFINITION_ORDER</sorting> </component> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> - <component name="ProjectFrameBounds"> - <option name="x" value="174" /> - <option name="y" value="120" /> + <component name="ProjectFrameBounds" extendedState="1"> + <option name="x" value="29" /> + <option name="y" value="59" /> <option name="width" value="1868" /> - <option name="height" value="958" /> + <option name="height" value="1063" /> </component> <component name="ProjectView"> <navigator currentView="ProjectPane" proportions="" version="1"> @@ -172,11 +212,6 @@ <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> </path> - <path> - <item name="resource" type="b2602c69:ProjectViewProjectNode" /> - <item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" /> - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> - </path> </expand> <select /> </subPane> @@ -256,15 +291,15 @@ <workItem from="1569486627319" duration="2740000" /> <workItem from="1569494185536" duration="1054000" /> <workItem from="1569544728303" duration="25104000" /> - <workItem from="1569716359574" duration="9691000" /> + <workItem from="1569716359574" duration="14315000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="408682000" /> + <option name="totallyTimeSpent" value="413306000" /> </component> <component name="ToolWindowManager"> - <frame x="174" y="120" width="1868" height="958" extended-state="0" /> + <frame x="29" y="59" width="1868" height="1063" extended-state="1" /> <editor active="true" /> <layout> <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 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1150"> - <caret line="757" column="5" lean-forward="true" selection-start-line="757" selection-start-column="5" selection-end-line="757" selection-end-column="5" /> - <folding> - <element signature="e#346#543#0#PHP" expanded="false" /> - <element signature="e#548#956#0#PHP" expanded="false" /> - <element signature="e#962#1253#0#PHP" expanded="false" /> - <element signature="e#1258#2915#0#PHP" expanded="false" /> - <element signature="e#2921#3205#0#PHP" expanded="false" /> - <element signature="e#3210#3449#0#PHP" expanded="false" /> - <element signature="e#3455#3779#0#PHP" expanded="false" /> - <element signature="e#3784#4315#0#PHP" expanded="false" /> - <element signature="e#4321#4795#0#PHP" expanded="false" /> - <element signature="e#4802#5801#0#PHP" expanded="false" /> - <element signature="e#5807#6460#0#PHP" expanded="false" /> - <element signature="e#6465#7622#0#PHP" expanded="false" /> - <element signature="e#7628#8331#0#PHP" expanded="false" /> - <element signature="e#8336#9973#0#PHP" expanded="false" /> - <element signature="e#9979#10837#0#PHP" expanded="false" /> - <element signature="e#10842#12780#0#PHP" expanded="false" /> - <element signature="e#12786#13626#0#PHP" expanded="false" /> - <element signature="e#13631#15736#0#PHP" expanded="false" /> - <element signature="e#15742#16389#0#PHP" expanded="false" /> - <element signature="e#16394#18009#0#PHP" expanded="false" /> - <element signature="e#18015#18431#0#PHP" expanded="false" /> - <element signature="e#18436#19255#0#PHP" expanded="false" /> - <element signature="e#19260#19938#0#PHP" expanded="false" /> - <element signature="e#19944#20398#0#PHP" expanded="false" /> - <element signature="e#20403#21261#0#PHP" expanded="false" /> - <element signature="e#21267#21773#0#PHP" expanded="false" /> - <element signature="e#21778#23209#0#PHP" expanded="false" /> - <element signature="e#23215#23494#0#PHP" expanded="false" /> - <element signature="e#23499#23941#0#PHP" expanded="false" /> - <element signature="e#23947#24181#0#PHP" expanded="false" /> - <element signature="e#24186#24579#0#PHP" expanded="false" /> - <element signature="e#24585#24816#0#PHP" expanded="false" /> - <element signature="e#24821#25179#0#PHP" expanded="false" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="325"> @@ -694,8 +687,8 @@ </entry> <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="447"> - <caret line="325" column="24" lean-forward="true" selection-start-line="325" selection-start-column="24" selection-end-line="325" selection-end-column="24" /> + <state relative-caret-position="296"> + <caret line="300" column="37" lean-forward="true" selection-start-line="300" selection-start-column="37" selection-end-line="300" selection-end-column="37" /> <folding> <element signature="e#129#158#0#PHP" expanded="true" /> <element signature="e#325#493#0#PHP" expanded="false" /> @@ -720,5 +713,43 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="450"> + <caret line="128" column="18" lean-forward="false" selection-start-line="128" selection-start-column="18" selection-end-line="128" selection-end-column="18" /> + <folding> + <element signature="e#346#543#0#PHP" expanded="false" /> + <element signature="e#548#956#0#PHP" expanded="false" /> + <element signature="e#962#1253#0#PHP" expanded="false" /> + <element signature="e#1258#2915#0#PHP" expanded="false" /> + <element signature="e#4216#4690#0#PHP" expanded="false" /> + <element signature="e#4697#5696#0#PHP" expanded="false" /> + <element signature="e#5702#6355#0#PHP" expanded="false" /> + <element signature="e#6360#7517#0#PHP" expanded="false" /> + <element signature="e#7523#8226#0#PHP" expanded="false" /> + <element signature="e#8231#9868#0#PHP" expanded="false" /> + <element signature="e#9874#10732#0#PHP" expanded="false" /> + <element signature="e#10737#12675#0#PHP" expanded="false" /> + <element signature="e#12681#13521#0#PHP" expanded="false" /> + <element signature="e#13526#15631#0#PHP" expanded="false" /> + <element signature="e#15637#16284#0#PHP" expanded="false" /> + <element signature="e#16289#17904#0#PHP" expanded="false" /> + <element signature="e#17910#18326#0#PHP" expanded="false" /> + <element signature="e#18331#19150#0#PHP" expanded="false" /> + <element signature="e#19155#19833#0#PHP" expanded="false" /> + <element signature="e#19839#20293#0#PHP" expanded="false" /> + <element signature="e#20298#21156#0#PHP" expanded="false" /> + <element signature="e#21162#21668#0#PHP" expanded="false" /> + <element signature="e#21673#23104#0#PHP" expanded="false" /> + <element signature="e#23110#23389#0#PHP" expanded="false" /> + <element signature="e#23394#23836#0#PHP" expanded="false" /> + <element signature="e#23842#24076#0#PHP" expanded="false" /> + <element signature="e#24081#24474#0#PHP" expanded="false" /> + <element signature="e#24480#24711#0#PHP" expanded="false" /> + <element signature="e#24716#25074#0#PHP" expanded="false" /> + </folding> + </state> + </provider> + </entry> </component> </project> \ No newline at end of file diff --git a/api/index/controller/OtherController.php b/api/index/controller/OtherController.php index a566388..50a0492 100644 --- a/api/index/controller/OtherController.php +++ b/api/index/controller/OtherController.php @@ -417,5 +417,4 @@ class OtherController extends RestBaseController return $result; } - } \ No newline at end of file diff --git a/api/index/controller/ResourceController.php b/api/index/controller/ResourceController.php index aa563e4..5bda933 100644 --- a/api/index/controller/ResourceController.php +++ b/api/index/controller/ResourceController.php @@ -128,8 +128,6 @@ class ResourceController extends RestBaseController * @url /index/Resource/city * @method GET * - * @header name:XX-Token require:1 default: desc:token - * * @param name:sign_id type:int require:1 other:desc:省份的标识id * * @return id:城市ID @@ -137,7 +135,6 @@ class ResourceController extends RestBaseController */ public function city() { - $user_id = $this->getUserId(); $id = $this->request->param('sign_id'); if(empty($id)){ $data = Db::name('area')